wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Alistair Leslie-Hughes : winex11.drv: Define ControlMask when not available.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: cf4a781e987a98a8d48610362a20a320c4a1016d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4a781e987a98a8d4861036… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 22 17:40:44 2022 +1000 winex11.drv: Define ControlMask when not available. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winex11.drv/bitblt.c | 2 -- dlls/winex11.drv/event.c | 6 ------ dlls/winex11.drv/keyboard.c | 7 ++++--- dlls/winex11.drv/mouse.c | 4 +--- dlls/winex11.drv/window.c | 6 +++--- dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 4 +--- 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index d1e6407d87c..10388a1cc8f 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -46,8 +46,6 @@ # endif #endif -#include "windef.h" -#include "winbase.h" #include "x11drv.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index cbab1dcfe13..f81d2338faf 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -39,13 +39,7 @@ #include <stdarg.h> #include <string.h> -#include "windef.h" -#include "winbase.h" - #include "x11drv.h" - -/* avoid conflict with field names in included win32 headers */ -#undef Status #include "shlobj.h" /* DROPFILES */ #include "shellapi.h" diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 6157548474b..7b4ad9acd8d 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -44,14 +44,13 @@ #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" +#include "x11drv.h" + #include "wingdi.h" #include "winuser.h" #include "winreg.h" #include "winnls.h" #include "ime.h" -#include "x11drv.h" #include "wine/server.h" #include "wine/debug.h" @@ -64,6 +63,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(keyboard); WINE_DECLARE_DEBUG_CHANNEL(key); +static const unsigned int ControlMask = 1 << 2; + static int min_keycode, max_keycode, keysyms_per_keycode; static KeySym *key_mapping; static WORD keyc2vkey[256], keyc2scan[256]; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d0cdd3d4984..2ce03c3f12f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -50,11 +50,9 @@ MAKE_FUNCPTR(XcursorLibraryLoadCursor); #define NONAMELESSUNION #define OEMRESOURCE -#include "windef.h" -#include "winbase.h" -#include "winreg.h" #include "x11drv.h" +#include "winreg.h" #include "wine/server.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 773fa81f5f3..07fb1515e24 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -43,14 +43,14 @@ /* avoid conflict with field names in included win32 headers */ #undef Status + #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" + +#include "x11drv.h" #include "wingdi.h" #include "winuser.h" -#include "x11drv.h" #include "wine/debug.h" #include "wine/server.h" #include "mwm.h" diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 613dc0e05fe..222d7328387 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -57,6 +57,9 @@ #undef Status /* avoid conflict with wintrnl.h */ typedef int Status; +/* avoid conflict with processthreadsapi.h */ +#undef ControlMask + #include "windef.h" #include "winbase.h" #include "ntgdi.h" diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 40d0e750d1b..a118757dfbe 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -45,14 +45,12 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" #define VK_NO_PROTOTYPES #define WINE_VK_HOST #include "x11drv.h" +#include "winreg.h" #include "xcomposite.h" #include "wine/server.h" #include "wine/debug.h"

1 0

Rémi Bernon : ntdll: Store the block size directly in block headers.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 4c3cc858f87aaaf4d3e6f0809ab09a520f8da37d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c3cc858f87aaaf4d3e6f080… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 16:08:44 2022 +0200 ntdll: Store the block size directly in block headers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ac0f14646c4..1b6337d4ce8 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -253,17 +253,11 @@ static inline UINT block_get_overhead( const struct block *block ) /* return the size of a block, including its header */ static inline UINT block_get_size( const struct block *block ) { - UINT data_size = block->size & ARENA_SIZE_MASK, size = data_size; - if (block_get_flags( block ) & ARENA_FLAG_FREE) size += sizeof(struct entry); - else size += sizeof(*block); - if (size < data_size) return ~0u; - return size; + return block->size & ARENA_SIZE_MASK; } static inline void block_set_size( struct block *block, UINT flags, UINT block_size ) { - if (flags & ARENA_FLAG_FREE) block_size -= sizeof(struct entry); - else block_size -= sizeof(*block); block->size = (block_size & ARENA_SIZE_MASK) | (flags & ~ARENA_SIZE_MASK); }

1 0

Rémi Bernon : ntdll: Prefer using block size rather than data size.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 86b2ca98a4271a87e341e481c1f57d85b0422379 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86b2ca98a4271a87e341e481… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 22:01:01 2022 +0200 ntdll: Prefer using block size rather than data size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 88 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86b2ca98a4271a87e341…

1 0

Rémi Bernon : ntdll: Add a first heap block member to the subheap.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 7f9efcd4169a8181b3cee9f3a910fd2390fbc101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f9efcd4169a8181b3cee9f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 25 09:30:43 2022 +0200 ntdll: Add a first heap block member to the subheap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 061dbd8a731..d83e3971420 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -161,17 +161,19 @@ typedef union struct tagHEAP; -typedef struct tagSUBHEAP +typedef struct DECLSPEC_ALIGN(ALIGNMENT) tagSUBHEAP { + SIZE_T __pad[sizeof(SIZE_T) / sizeof(DWORD)]; SIZE_T size; /* Size of the whole sub-heap */ SIZE_T commitSize; /* Committed size of the sub-heap */ struct list entry; /* Entry in sub-heap list */ struct tagHEAP *heap; /* Main heap structure */ - DWORD headerSize; /* Size of the heap header */ - DWORD magic; /* Magic number */ + struct block block; } SUBHEAP; -#define SUBHEAP_MAGIC ((DWORD)('S' | ('U'<<8) | ('B'<<16) | ('H'<<24))) +/* block must be last and aligned */ +C_ASSERT( sizeof(SUBHEAP) == offsetof(SUBHEAP, block) + sizeof(struct block) ); +C_ASSERT( sizeof(SUBHEAP) == 4 * ALIGNMENT ); typedef struct tagHEAP { /* win32/win64 */ @@ -199,6 +201,9 @@ typedef struct tagHEAP SUBHEAP subheap; } HEAP; +/* subheap must be last and aligned */ +C_ASSERT( sizeof(HEAP) == offsetof(HEAP, subheap) + sizeof(SUBHEAP) ); +C_ASSERT( sizeof(HEAP) % ALIGNMENT == 0 ); C_ASSERT( offsetof(HEAP, subheap) <= COMMIT_MASK ); #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) @@ -274,7 +279,7 @@ static inline SIZE_T subheap_size( const SUBHEAP *subheap ) static inline SIZE_T subheap_overhead( const SUBHEAP *subheap ) { - return subheap->headerSize; + return (char *)&subheap->block - (char *)subheap_base( subheap ); } static inline const void *subheap_commit_end( const SUBHEAP *subheap ) @@ -284,7 +289,7 @@ static inline const void *subheap_commit_end( const SUBHEAP *subheap ) static inline void *first_block( const SUBHEAP *subheap ) { - return (char *)subheap_base( subheap ) + subheap->headerSize; + return (void *)&subheap->block; } static inline const void *last_block( const SUBHEAP *subheap ) @@ -303,7 +308,7 @@ static inline struct block *next_block( const SUBHEAP *subheap, const struct blo static inline BOOL check_subheap( const SUBHEAP *subheap ) { const char *base = ROUND_ADDR( subheap, COMMIT_MASK ); - return contains( base, subheap->size, base + subheap->headerSize, subheap->commitSize - subheap->headerSize ); + return contains( base, subheap->size, &subheap->block, base + subheap->commitSize - (char *)&subheap->block ); } static BOOL heap_validate( const HEAP *heap ); @@ -941,8 +946,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap->heap = heap; subheap->size = totalSize; subheap->commitSize = commitSize; - subheap->magic = SUBHEAP_MAGIC; - subheap->headerSize = ROUND_SIZE( sizeof(SUBHEAP) ); list_add_head( &heap->subheap_list, &subheap->entry ); } else @@ -964,8 +967,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap->heap = heap; subheap->size = totalSize; subheap->commitSize = commitSize; - subheap->magic = SUBHEAP_MAGIC; - subheap->headerSize = ROUND_SIZE( sizeof(HEAP) ); list_add_head( &heap->subheap_list, &subheap->entry ); /* Build the free lists */ @@ -1048,12 +1049,9 @@ static struct block *find_free_block( HEAP *heap, SIZE_T data_size, SUBHEAP **su WARN("Not enough space in heap %p for %08lx bytes\n", heap, data_size ); return NULL; } - /* make sure that we have a big enough size *committed* to fit another - * last free arena in ! - * So just one heap struct, one first free arena which will eventually - * get used, and a second free arena that might get assigned all remaining - * free space in shrink_used_block() */ - total_size = data_size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); + + /* SUBHEAP includes the first block header, and we want to fit a free entry at the end */ + total_size = sizeof(SUBHEAP) + data_size + sizeof(ARENA_FREE); if (total_size < data_size) return NULL; /* overflow */ if ((*subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size,

1 0

Rémi Bernon : ntdll: Move min commit size to main heap struct.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 74453b7c24bd9dbe1dd84d3172b8cbc256ca38b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74453b7c24bd9dbe1dd84d31… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 12:46:40 2022 +0200 ntdll: Move min commit size to main heap struct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 52c9e120a64..061dbd8a731 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -164,7 +164,6 @@ struct tagHEAP; typedef struct tagSUBHEAP { SIZE_T size; /* Size of the whole sub-heap */ - SIZE_T min_commit; /* Minimum committed size */ SIZE_T commitSize; /* Committed size of the sub-heap */ struct list entry; /* Entry in sub-heap list */ struct tagHEAP *heap; /* Main heap structure */ @@ -191,6 +190,7 @@ typedef struct tagHEAP struct list subheap_list; /* Sub-heap list */ struct list large_list; /* Large blocks list */ SIZE_T grow_size; /* Size of next subheap for growing heap */ + SIZE_T min_size; /* Minimum committed size */ DWORD magic; /* Magic number */ DWORD pending_pos; /* Position in pending free requests ring */ ARENA_INUSE **pending_free; /* Ring buffer for pending free requests */ @@ -649,12 +649,13 @@ static inline BOOL subheap_commit( SUBHEAP *subheap, const struct block *block, static inline BOOL subheap_decommit( SUBHEAP *subheap, const void *commit_end ) { + char *base = subheap_base( subheap ); HEAP *heap = subheap->heap; SIZE_T size; void *addr; commit_end = ROUND_ADDR((char *)commit_end + COMMIT_MASK, COMMIT_MASK); - commit_end = max( (char *)commit_end, (char *)subheap_base( subheap ) + subheap->min_commit ); + if (subheap == &heap->subheap) commit_end = max( (char *)commit_end, (char *)base + heap->min_size ); if (commit_end >= subheap_commit_end( subheap )) return TRUE; size = (char *)subheap_commit_end( subheap ) - (char *)commit_end; @@ -939,7 +940,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap = address; subheap->heap = heap; subheap->size = totalSize; - subheap->min_commit = 0x10000; subheap->commitSize = commitSize; subheap->magic = SUBHEAP_MAGIC; subheap->headerSize = ROUND_SIZE( sizeof(SUBHEAP) ); @@ -956,13 +956,13 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap->shared = (flags & HEAP_SHARED) != 0; heap->magic = HEAP_MAGIC; heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); + heap->min_size = commitSize; list_init( &heap->subheap_list ); list_init( &heap->large_list ); subheap = &heap->subheap; subheap->heap = heap; subheap->size = totalSize; - subheap->min_commit = commitSize; subheap->commitSize = commitSize; subheap->magic = SUBHEAP_MAGIC; subheap->headerSize = ROUND_SIZE( sizeof(HEAP) );

1 0

Rémi Bernon : ntdll: Remove base member from SUBHEAP struct.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 0f49c99a10711e46d21c59175d6d023d9ea8b70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f49c99a10711e46d21c5917… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 25 09:28:33 2022 +0200 ntdll: Remove base member from SUBHEAP struct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 15b708f66c2..52c9e120a64 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -122,6 +122,7 @@ typedef struct #define ALIGNMENT (2*sizeof(void*)) #define LARGE_ALIGNMENT 16 /* large blocks have stricter alignment */ #define ARENA_OFFSET (ALIGNMENT - sizeof(ARENA_INUSE)) +#define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); @@ -162,7 +163,6 @@ struct tagHEAP; typedef struct tagSUBHEAP { - void *base; /* Base address of the sub-heap memory block */ SIZE_T size; /* Size of the whole sub-heap */ SIZE_T min_commit; /* Minimum committed size */ SIZE_T commitSize; /* Committed size of the sub-heap */ @@ -199,10 +199,11 @@ typedef struct tagHEAP SUBHEAP subheap; } HEAP; +C_ASSERT( offsetof(HEAP, subheap) <= COMMIT_MASK ); + #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) #define HEAP_DEF_SIZE 0x110000 /* Default heap size = 1Mb + 64Kb */ -#define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */ #define MAX_FREE_PENDING 1024 /* max number of free requests to delay */ /* some undocumented flags (names are made up) */ @@ -263,7 +264,7 @@ static inline void block_set_size( struct block *block, UINT flags, UINT block_s static inline void *subheap_base( const SUBHEAP *subheap ) { - return subheap->base; + return ROUND_ADDR( subheap, COMMIT_MASK ); } static inline SIZE_T subheap_size( const SUBHEAP *subheap ) @@ -301,7 +302,7 @@ static inline struct block *next_block( const SUBHEAP *subheap, const struct blo static inline BOOL check_subheap( const SUBHEAP *subheap ) { - const char *base = subheap->base; + const char *base = ROUND_ADDR( subheap, COMMIT_MASK ); return contains( base, subheap->size, base + subheap->headerSize, subheap->commitSize - subheap->headerSize ); } @@ -936,7 +937,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* If this is a secondary subheap, insert it into list */ subheap = address; - subheap->base = address; subheap->heap = heap; subheap->size = totalSize; subheap->min_commit = 0x10000; @@ -960,7 +960,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, list_init( &heap->large_list ); subheap = &heap->subheap; - subheap->base = address; subheap->heap = heap; subheap->size = totalSize; subheap->min_commit = commitSize; @@ -1476,13 +1475,13 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) notify_free_all( subheap ); list_remove( &subheap->entry ); size = 0; - addr = subheap->base; + addr = ROUND_ADDR( subheap, COMMIT_MASK ); NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } notify_free_all( &heapPtr->subheap ); RtlFreeHeap( GetProcessHeap(), 0, heapPtr->pending_free ); size = 0; - addr = heapPtr->subheap.base; + addr = heap; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); return 0; }

1 0

Rémi Bernon : ntdll: Consistently use a heap local variable.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 2e4b637f26853a36773429c6de6feb105ffa4136 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e4b637f26853a36773429c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 30 00:09:54 2022 +0200 ntdll: Consistently use a heap local variable. Instead of subheap->heap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 540625bff27..15b708f66c2 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1393,6 +1393,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c PVOID unknown, PRTL_HEAP_DEFINITION definition ) { SUBHEAP *subheap; + HEAP *heap; /* Allocate the heap block */ @@ -1402,24 +1403,24 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c if (!totalSize) totalSize = HEAP_DEF_SIZE; if (!(subheap = HEAP_CreateSubHeap( NULL, addr, flags, commitSize, totalSize ))) return 0; + heap = subheap->heap; - heap_set_debug_flags( subheap->heap ); + heap_set_debug_flags( heap ); /* link it into the per-process heap list */ if (processHeap) { - HEAP *heapPtr = subheap->heap; RtlEnterCriticalSection( &processHeap->cs ); - list_add_head( &processHeap->entry, &heapPtr->entry ); + list_add_head( &processHeap->entry, &heap->entry ); RtlLeaveCriticalSection( &processHeap->cs ); } else if (!addr) { - processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ + processHeap = heap; /* assume the first heap we create is the process main heap */ list_init( &processHeap->entry ); } - return subheap->heap; + return heap; }

1 0

Rémi Bernon : qasf: Implement ASF Reader filter stream stubs.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: c39dbe1f31435e715cd10bdf83be864e00346699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c39dbe1f31435e715cd10bdf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 23 13:20:51 2022 +0200 qasf: Implement ASF Reader filter stream stubs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 92 +++++++++++++++++++++++++++++++++++++++++++-- dlls/qasf/tests/asfreader.c | 6 --- 2 files changed, 89 insertions(+), 9 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index b65529ec3bf..13b6e2d7bbe 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -27,6 +27,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +struct asf_stream +{ + struct strmbase_source source; + DWORD index; +}; + struct asf_reader { struct strmbase_filter filter; @@ -37,6 +43,9 @@ struct asf_reader IWMReaderCallback *callback; IWMReader *reader; + + UINT stream_count; + struct asf_stream streams[16]; }; static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -46,12 +55,31 @@ static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filte static struct strmbase_pin *asf_reader_get_pin(struct strmbase_filter *iface, unsigned int index) { - return NULL; + struct asf_reader *filter = impl_from_strmbase_filter(iface); + struct strmbase_pin *pin = NULL; + + TRACE("iface %p, index %u.\n", iface, index); + + EnterCriticalSection(&filter->filter.filter_cs); + if (index < filter->stream_count) + pin = &filter->streams[index].source.pin; + LeaveCriticalSection(&filter->filter.filter_cs); + + return pin; } static void asf_reader_destroy(struct strmbase_filter *iface) { struct asf_reader *filter = impl_from_strmbase_filter(iface); + struct strmbase_source *source; + + while (filter->stream_count--) + { + source = &filter->streams[filter->stream_count].source; + if (source->pin.peer) IPin_Disconnect(source->pin.peer); + IPin_Disconnect(&source->pin.IPin_iface); + strmbase_source_cleanup(source); + } free(filter->file_name); FreeMediaType(&filter->media_type); @@ -83,6 +111,20 @@ static const struct strmbase_filter_ops filter_ops = .filter_query_interface = asf_reader_query_interface, }; +static HRESULT WINAPI asf_reader_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *allocator, ALLOCATOR_PROPERTIES *req_props) +{ + FIXME("iface %p, allocator %p, req_props %p stub!\n", iface, allocator, req_props); + return E_NOTIMPL; +} + +static const struct strmbase_source_ops source_ops = +{ + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideBufferSize = asf_reader_DecideBufferSize, +}; + static inline struct asf_reader *impl_from_IFileSourceFilter(IFileSourceFilter *iface) { return CONTAINING_RECORD(iface, struct asf_reader, IFileSourceFilter_iface); @@ -232,9 +274,51 @@ static ULONG WINAPI reader_callback_Release(IWMReaderCallback *iface) static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS status, HRESULT hr, WMT_ATTR_DATATYPE type, BYTE *value, void *context) { - FIXME("iface %p, status %d, hr %#lx, type %d, value %p, context %p stub!\n", + struct asf_reader *filter = impl_from_IWMReaderCallback(iface)->filter; + DWORD i, stream_count; + WCHAR name[MAX_PATH]; + + TRACE("iface %p, status %d, hr %#lx, type %d, value %p, context %p.\n", iface, status, hr, type, value, context); - return E_NOTIMPL; + + switch (status) + { + case WMT_OPENED: + if (FAILED(hr)) + { + ERR("Failed to open WMReader, hr %#lx.\n", hr); + break; + } + if (FAILED(hr = IWMReader_GetOutputCount(filter->reader, &stream_count))) + { + ERR("Failed to get WMReader output count, hr %#lx.\n", hr); + break; + } + if (stream_count > ARRAY_SIZE(filter->streams)) + { + FIXME("Found %lu streams, not supported!\n", stream_count); + stream_count = ARRAY_SIZE(filter->streams); + } + + EnterCriticalSection(&filter->filter.filter_cs); + for (i = 0; i < stream_count; ++i) + { + struct asf_stream *stream = filter->streams + i; + swprintf(name, ARRAY_SIZE(name), L"Raw Stream %u", stream->index); + strmbase_source_init(&stream->source, &filter->filter, name, &source_ops); + } + filter->stream_count = stream_count; + LeaveCriticalSection(&filter->filter.filter_cs); + + BaseFilterImpl_IncrementPinVersion(&filter->filter); + break; + + default: + WARN("Ignoring status %#x.\n", status); + break; + } + + return S_OK; } static HRESULT WINAPI reader_callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, @@ -273,6 +357,7 @@ HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) { struct asf_reader *object; HRESULT hr; + int i; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -289,6 +374,7 @@ HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) return hr; } + for (i = 0; i < ARRAY_SIZE(object->streams); ++i) object->streams[i].index = i; strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); object->IFileSourceFilter_iface.lpVtbl = &file_source_vtbl; diff --git a/dlls/qasf/tests/asfreader.c b/dlls/qasf/tests/asfreader.c index 54c38263464..494d0384ac8 100644 --- a/dlls/qasf/tests/asfreader.c +++ b/dlls/qasf/tests/asfreader.c @@ -242,9 +242,7 @@ static void check_pin(IPin *pin, IBaseFilter *expect_filter, PIN_DIRECTION expec CoTaskMemFree(id); hr = IPin_EnumMediaTypes(pin, &enum_mt); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr != S_OK) goto skip_enum_mt; for (i = 0; (hr = IEnumMediaTypes_Next(enum_mt, 1, &mt, NULL)) == S_OK; i++) { if (i < expect_mt_count) @@ -260,7 +258,6 @@ static void check_pin(IPin *pin, IBaseFilter *expect_filter, PIN_DIRECTION expec ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumMediaTypes_Release(enum_mt); -skip_enum_mt: check_interface(pin, &IID_IPin, TRUE); check_interface(pin, &IID_IUnknown, TRUE); todo_wine @@ -499,9 +496,7 @@ static void test_filesourcefilter(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enumpins, 1, pins, NULL); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr != S_OK) goto skip_pins; check_pin(pins[0], filter, PINDIR_OUTPUT, L"Raw Video 0", L"Raw Video 0", video_mt, ARRAY_SIZE(video_mt)); IPin_Release(pins[0]); @@ -511,7 +506,6 @@ static void test_filesourcefilter(void) IPin_Release(pins[0]); hr = IEnumPins_Next(enumpins, 1, pins, NULL); -skip_pins: ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumPins_Release(enumpins);

1 0

Rémi Bernon : qasf: Create and open a WMReader in the ASF Reader filter.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: e8bf5dcdf8cdbb365e9ca8703debdc2ae5f98279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8bf5dcdf8cdbb365e9ca870… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 21:48:59 2022 +0200 qasf: Create and open a WMReader in the ASF Reader filter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/Makefile.in | 2 +- dlls/qasf/asfreader.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index ee8fd0451e1..05c947b6255 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -1,5 +1,5 @@ MODULE = qasf.dll -IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 +IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 wmvcore C_SRCS = \ asfreader.c \ diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index a657b719456..b65529ec3bf 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -20,6 +20,11 @@ #include "qasf_private.h" +#include "mediaobj.h" +#include "propsys.h" +#include "initguid.h" +#include "wmsdkidl.h" + WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct asf_reader @@ -29,6 +34,9 @@ struct asf_reader AM_MEDIA_TYPE media_type; WCHAR *file_name; + + IWMReaderCallback *callback; + IWMReader *reader; }; static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -47,6 +55,8 @@ static void asf_reader_destroy(struct strmbase_filter *iface) free(filter->file_name); FreeMediaType(&filter->media_type); + IWMReaderCallback_Release(filter->callback); + IWMReader_Release(filter->reader); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -102,6 +112,7 @@ static ULONG WINAPI file_source_Release(IFileSourceFilter *iface) static HRESULT WINAPI file_source_Load(IFileSourceFilter *iface, LPCOLESTR file_name, const AM_MEDIA_TYPE *media_type) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + HRESULT hr; TRACE("filter %p, file_name %s, media_type %p.\n", filter, debugstr_w(file_name), media_type); strmbase_dump_media_type(media_type); @@ -118,6 +129,9 @@ static HRESULT WINAPI file_source_Load(IFileSourceFilter *iface, LPCOLESTR file_ if (media_type) CopyMediaType(&filter->media_type, media_type); + if (FAILED(hr = IWMReader_Open(filter->reader, filter->file_name, filter->callback, NULL))) + WARN("Failed to open WM reader, hr %#lx.\n", hr); + return S_OK; } @@ -158,13 +172,123 @@ static const IFileSourceFilterVtbl file_source_vtbl = file_source_GetCurFile, }; +struct asf_callback +{ + IWMReaderCallback IWMReaderCallback_iface; + LONG ref; + + struct asf_reader *filter; +}; + +static inline struct asf_callback *impl_from_IWMReaderCallback(IWMReaderCallback *iface) +{ + return CONTAINING_RECORD(iface, struct asf_callback, IWMReaderCallback_iface); +} + +static HRESULT WINAPI reader_callback_QueryInterface(IWMReaderCallback *iface, const IID *iid, void **out) +{ + struct asf_callback *callback = impl_from_IWMReaderCallback(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IWMStatusCallback) + || IsEqualGUID(iid, &IID_IWMReaderCallback)) + *out = &callback->IWMReaderCallback_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI reader_callback_AddRef(IWMReaderCallback *iface) +{ + struct asf_callback *callback = impl_from_IWMReaderCallback(iface); + ULONG ref = InterlockedIncrement(&callback->ref); + + TRACE("%p increasing ref to %lu.\n", callback, ref); + + return ref; +} + +static ULONG WINAPI reader_callback_Release(IWMReaderCallback *iface) +{ + struct asf_callback *callback = impl_from_IWMReaderCallback(iface); + ULONG ref = InterlockedDecrement(&callback->ref); + + TRACE("%p decreasing ref to %lu.\n", callback, ref); + + if (!ref) + free(callback); + + return ref; +} + +static HRESULT WINAPI reader_callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS status, HRESULT hr, + WMT_ATTR_DATATYPE type, BYTE *value, void *context) +{ + FIXME("iface %p, status %d, hr %#lx, type %d, value %p, context %p stub!\n", + iface, status, hr, type, value, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, + QWORD duration, DWORD flags, INSSBuffer *sample, void *context) +{ + FIXME("iface %p, output %lu, time %I64u, duration %I64u, flags %#lx, sample %p, context %p stub!\n", + iface, output, time, duration, flags, sample, context); + return E_NOTIMPL; +} + +static const IWMReaderCallbackVtbl reader_callback_vtbl = +{ + reader_callback_QueryInterface, + reader_callback_AddRef, + reader_callback_Release, + reader_callback_OnStatus, + reader_callback_OnSample, +}; + +static HRESULT asf_callback_create(struct asf_reader *filter, IWMReaderCallback **out) +{ + struct asf_callback *callback; + + if (!(callback = calloc(1, sizeof(*callback)))) + return E_OUTOFMEMORY; + + callback->IWMReaderCallback_iface.lpVtbl = &reader_callback_vtbl; + callback->filter = filter; + callback->ref = 1; + + *out = &callback->IWMReaderCallback_iface; + return S_OK; +} + HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) { struct asf_reader *object; + HRESULT hr; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; + if (FAILED(hr = WMCreateReader(NULL, 0, &object->reader))) + { + free(object); + return hr; + } + if (FAILED(hr = asf_callback_create(object, &object->callback))) + { + IWMReader_Release(object->reader); + free(object); + return hr; + } + strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); object->IFileSourceFilter_iface.lpVtbl = &file_source_vtbl;

1 0

Rémi Bernon : qasf: Rename variables and functions.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: bee6d2049e2f2c3b87ab5bcc5458ff900ec42850 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bee6d2049e2f2c3b87ab5bcc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 17 16:15:53 2022 +0200 qasf: Rename variables and functions. * filesourcefilter_ prefix to file_source_. * type to media_type. * filename to file_name. * impl_reader_from_strmbase_filter to impl_from_strmbase_filter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/asfreader.c | 76 +++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index ba782f19ad9..a657b719456 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -27,11 +27,11 @@ struct asf_reader struct strmbase_filter filter; IFileSourceFilter IFileSourceFilter_iface; - AM_MEDIA_TYPE type; - WCHAR *filename; + AM_MEDIA_TYPE media_type; + WCHAR *file_name; }; -static inline struct asf_reader *impl_reader_from_strmbase_filter(struct strmbase_filter *iface) +static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct asf_reader, filter); } @@ -43,10 +43,10 @@ static struct strmbase_pin *asf_reader_get_pin(struct strmbase_filter *iface, un static void asf_reader_destroy(struct strmbase_filter *iface) { - struct asf_reader *filter = impl_reader_from_strmbase_filter(iface); + struct asf_reader *filter = impl_from_strmbase_filter(iface); - free(filter->filename); - FreeMediaType(&filter->type); + free(filter->file_name); + FreeMediaType(&filter->media_type); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -54,7 +54,7 @@ static void asf_reader_destroy(struct strmbase_filter *iface) static HRESULT asf_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) { - struct asf_reader *filter = impl_reader_from_strmbase_filter(iface); + struct asf_reader *filter = impl_from_strmbase_filter(iface); if (IsEqualGUID(iid, &IID_IFileSourceFilter)) { @@ -78,84 +78,84 @@ static inline struct asf_reader *impl_from_IFileSourceFilter(IFileSourceFilter * return CONTAINING_RECORD(iface, struct asf_reader, IFileSourceFilter_iface); } -static HRESULT WINAPI filesourcefilter_QueryInterface(IFileSourceFilter *iface, REFIID iid, void **out) +static HRESULT WINAPI file_source_QueryInterface(IFileSourceFilter *iface, REFIID iid, void **out) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); return IBaseFilter_QueryInterface(&filter->filter.IBaseFilter_iface, iid, out); } -static ULONG WINAPI filesourcefilter_AddRef(IFileSourceFilter *iface) +static ULONG WINAPI file_source_AddRef(IFileSourceFilter *iface) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); return IBaseFilter_AddRef(&filter->filter.IBaseFilter_iface); } -static ULONG WINAPI filesourcefilter_Release(IFileSourceFilter *iface) +static ULONG WINAPI file_source_Release(IFileSourceFilter *iface) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); return IBaseFilter_Release(&filter->filter.IBaseFilter_iface); } -static HRESULT WINAPI filesourcefilter_Load(IFileSourceFilter *iface, LPCOLESTR filename, const AM_MEDIA_TYPE *type) +static HRESULT WINAPI file_source_Load(IFileSourceFilter *iface, LPCOLESTR file_name, const AM_MEDIA_TYPE *media_type) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); - TRACE("filter %p, filename %s, type %p.\n", filter, debugstr_w(filename), type); - strmbase_dump_media_type(type); + TRACE("filter %p, file_name %s, media_type %p.\n", filter, debugstr_w(file_name), media_type); + strmbase_dump_media_type(media_type); - if (!filename) + if (!file_name) return E_POINTER; - if (filter->filename) + if (filter->file_name) return E_FAIL; - if (!(filter->filename = wcsdup(filename))) + if (!(filter->file_name = wcsdup(file_name))) return E_OUTOFMEMORY; - if (type) - CopyMediaType(&filter->type, type); + if (media_type) + CopyMediaType(&filter->media_type, media_type); return S_OK; } -static HRESULT WINAPI filesourcefilter_GetCurFile(IFileSourceFilter *iface, LPOLESTR *filename, AM_MEDIA_TYPE *type) +static HRESULT WINAPI file_source_GetCurFile(IFileSourceFilter *iface, LPOLESTR *file_name, AM_MEDIA_TYPE *media_type) { struct asf_reader *filter = impl_from_IFileSourceFilter(iface); - TRACE("filter %p, filename %p, type %p.\n", filter, filename, type); + TRACE("filter %p, file_name %p, media_type %p.\n", filter, file_name, media_type); - if (!filename) + if (!file_name) return E_POINTER; - *filename = NULL; + *file_name = NULL; - if (type) + if (media_type) { - type->majortype = filter->type.majortype; - type->subtype = filter->type.subtype; - type->lSampleSize = filter->type.lSampleSize; - type->pUnk = filter->type.pUnk; - type->cbFormat = filter->type.cbFormat; + media_type->majortype = filter->media_type.majortype; + media_type->subtype = filter->media_type.subtype; + media_type->lSampleSize = filter->media_type.lSampleSize; + media_type->pUnk = filter->media_type.pUnk; + media_type->cbFormat = filter->media_type.cbFormat; } - if (filter->filename) + if (filter->file_name) { - *filename = CoTaskMemAlloc((wcslen(filter->filename) + 1) * sizeof(WCHAR)); - wcscpy(*filename, filter->filename); + *file_name = CoTaskMemAlloc((wcslen(filter->file_name) + 1) * sizeof(WCHAR)); + wcscpy(*file_name, filter->file_name); } return S_OK; } -static const IFileSourceFilterVtbl filesourcefilter_vtbl = +static const IFileSourceFilterVtbl file_source_vtbl = { - filesourcefilter_QueryInterface, - filesourcefilter_AddRef, - filesourcefilter_Release, - filesourcefilter_Load, - filesourcefilter_GetCurFile, + file_source_QueryInterface, + file_source_AddRef, + file_source_Release, + file_source_Load, + file_source_GetCurFile, }; HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) @@ -166,7 +166,7 @@ HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); - object->IFileSourceFilter_iface.lpVtbl = &filesourcefilter_vtbl; + object->IFileSourceFilter_iface.lpVtbl = &file_source_vtbl; TRACE("Created WM ASF reader %p.\n", object); *out = &object->filter.IUnknown_inner;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
91
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-commits May 2022