April 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : kernelbase: Remove unnecessary handler from LocalLock.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: e358731f96ae9ca37c89df2c232338393e8477e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e358731f96ae9ca37c89df2c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 4 10:02:00 2022 +0200 kernelbase: Remove unnecessary handler from LocalLock. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 086674ab41c..9ae1b6d50dd 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -774,6 +774,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalFree( HLOCAL handle ) */ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) { + HANDLE heap = GetProcessHeap(); struct mem_entry *mem; void *ret = NULL; @@ -794,28 +795,20 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) return ret; } - RtlLockHeap( GetProcessHeap() ); - __TRY + RtlLockHeap( heap ); + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { - if ((mem = unsafe_mem_from_HLOCAL( handle ))) - { - ret = mem->ptr; - if (!mem->ptr) SetLastError( ERROR_DISCARDED ); - else if (mem->lock < LMEM_LOCKCOUNT) mem->lock++; - } - else - { - WARN_(globalmem)( "invalid handle %p\n", handle ); - SetLastError( ERROR_INVALID_HANDLE ); - } + ret = mem->ptr; + if (!mem->ptr) SetLastError( ERROR_DISCARDED ); + else if (mem->lock < LMEM_LOCKCOUNT) mem->lock++; } - __EXCEPT_PAGE_FAULT + else { - WARN_(globalmem)( "(%p): Page fault occurred ! Caused by bug ?\n", handle ); + WARN_(globalmem)( "invalid handle %p\n", handle ); SetLastError( ERROR_INVALID_HANDLE ); } - __ENDTRY - RtlUnlockHeap( GetProcessHeap() ); + RtlUnlockHeap( heap ); + return ret; }

1 0

Nikolay Sivov : include: Add IDebugAdvanced3 definition.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: 2c7ace25782e1620a59667d884b81f6f8108395f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c7ace25782e1620a59667d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:40:38 2022 +0300 include: Add IDebugAdvanced3 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbgeng.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/dbgeng.h b/include/dbgeng.h index e417704915a..4322eff5302 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -47,6 +47,8 @@ DEFINE_GUID(IID_IDebugControl2, 0xd4366723, 0x44df, 0x4bed, 0x8c, 0x7e DEFINE_GUID(IID_IDebugControl3, 0x7df74a86, 0xb03f, 0x407f, 0x90, 0xab, 0xa2, 0x0d, 0xad, 0xce, 0xad, 0x08); DEFINE_GUID(IID_IDebugControl4, 0x94e60ce9, 0x9b41, 0x4b19, 0x9f, 0xc0, 0x6d, 0x9e, 0xb3, 0x52, 0x72, 0xb3); DEFINE_GUID(IID_IDebugAdvanced, 0xf2df5f53, 0x071f, 0x47bd, 0x9d, 0xe6, 0x57, 0x34, 0xc3, 0xfe, 0xd6, 0x89); +DEFINE_GUID(IID_IDebugAdvanced2, 0x716d14c9, 0x119b, 0x4ba5, 0xaf, 0x1f, 0x08, 0x90, 0xe6, 0x72, 0x41, 0x6a); +DEFINE_GUID(IID_IDebugAdvanced3, 0xcba4abb4, 0x84c4, 0x444d, 0x87, 0xca, 0xa0, 0x4e, 0x13, 0x28, 0x67, 0x39); DEFINE_GUID(IID_IDebugSystemObjects, 0x6b86fe2c, 0x2c4f, 0x4f0c, 0x9d, 0xa2, 0x17, 0x43, 0x11, 0xac, 0xc3, 0x27); DEFINE_GUID(IID_IDebugSystemObjects2, 0x0ae9f5ff, 0x1852, 0x4679, 0xb0, 0x55, 0x49, 0x4b, 0xee, 0x64, 0x07, 0xee); DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9, 0xdf, 0xe5, 0xd9, 0xfc, 0x33, 0x0e); @@ -2347,6 +2349,67 @@ DECLARE_INTERFACE_(IDebugAdvanced, IUnknown) }; #undef INTERFACE +#define INTERFACE IDebugAdvanced2 +DECLARE_INTERFACE_(IDebugAdvanced2, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugAdvanced */ + STDMETHOD(GetThreadContext)(THIS_ void *context, ULONG context_size) PURE; + STDMETHOD(SetThreadContext)(THIS_ void *context, ULONG context_size) PURE; + /* IDebugAdvanced2 */ + STDMETHOD(Request)(THIS_ ULONG request, void *inbuffer, ULONG inbuffer_size, + void *outbuffer, ULONG outbuffer_size, ULONG *outsize) PURE; + STDMETHOD(GetSourceFileInformation)(THIS_ ULONG which, char *sourcefile, + ULONG64 arg64, ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) PURE; + STDMETHOD(FindSourceFileAndToken)(THIS_ ULONG start_element, ULONG64 modaddr, const char *filename, + ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, char *buffer, + ULONG buffer_size, ULONG *found_size) PURE; + STDMETHOD(GetSymbolInformation)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, void *buffer, + ULONG buffer_size, ULONG *info_size, char *string_buffer, ULONG string_buffer_size, + ULONG *string_size) PURE; + STDMETHOD(GetSystemObjectInformation)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, + void *buffer, ULONG buffer_size, ULONG *info_size) PURE; +}; +#undef INTERFACE + +#define INTERFACE IDebugAdvanced3 +DECLARE_INTERFACE_(IDebugAdvanced3, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugAdvanced */ + STDMETHOD(GetThreadContext)(THIS_ void *context, ULONG context_size) PURE; + STDMETHOD(SetThreadContext)(THIS_ void *context, ULONG context_size) PURE; + /* IDebugAdvanced2 */ + STDMETHOD(Request)(THIS_ ULONG request, void *inbuffer, ULONG inbuffer_size, + void *outbuffer, ULONG outbuffer_size, ULONG *outsize) PURE; + STDMETHOD(GetSourceFileInformation)(THIS_ ULONG which, char *sourcefile, + ULONG64 arg64, ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) PURE; + STDMETHOD(FindSourceFileAndToken)(THIS_ ULONG start_element, ULONG64 modaddr, const char *filename, + ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, char *buffer, + ULONG buffer_size, ULONG *found_size) PURE; + STDMETHOD(GetSymbolInformation)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, void *buffer, + ULONG buffer_size, ULONG *info_size, char *string_buffer, ULONG string_buffer_size, + ULONG *string_size) PURE; + STDMETHOD(GetSystemObjectInformation)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, + void *buffer, ULONG buffer_size, ULONG *info_size) PURE; + /* IDebugAdvanced3 */ + STDMETHOD(GetSourceFileInformationWide)(THIS_ ULONG which, WCHAR *source_file, ULONG64 arg64, + ULONG arg32, void *buffer, ULONG buffer_size, ULONG *info_size) PURE; + STDMETHOD(FindSourceFileAndTokenWide)(THIS_ ULONG start_element, ULONG64 modaddr, const WCHAR *filename, + ULONG flags, void *filetoken, ULONG filetokensize, ULONG *found_element, WCHAR *buffer, + ULONG buffer_size, ULONG *found_size) PURE; + STDMETHOD(GetSymbolInformationWide)(THIS_ ULONG which, ULONG64 arg64, ULONG arg32, void *buffer, + ULONG buffer_size, ULONG *info_size, WCHAR *string_buffer, ULONG string_buffer_size, + ULONG *string_size) PURE; +}; +#undef INTERFACE + #define INTERFACE IDebugSystemObjects DECLARE_INTERFACE_(IDebugSystemObjects, IUnknown) {

1 0

Nikolay Sivov : explorerframe/tests: Use CRT memory allocation functions.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: cc2b468b6252af3997830601e87267f20c307847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2b468b6252af3997830601… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 4 19:39:09 2022 +0300 explorerframe/tests: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/msg.h | 9 ++++----- dlls/explorerframe/tests/nstc.c | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/tests/msg.h b/dlls/explorerframe/tests/msg.h index 857278e4ef2..2a1752fda9f 100644 --- a/dlls/explorerframe/tests/msg.h +++ b/dlls/explorerframe/tests/msg.h @@ -20,7 +20,6 @@ #include <assert.h> #include <windows.h> -#include "wine/heap.h" #include "wine/test.h" /* undocumented SWP flags - from SDK 3.1 */ @@ -67,13 +66,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, if (!msg_seq->sequence) { msg_seq->size = 10; - msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message)); + msg_seq->sequence = malloc(msg_seq->size * sizeof (struct message)); } if (msg_seq->count == msg_seq->size) { msg_seq->size *= 2; - msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); + msg_seq->sequence = realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); } assert(msg_seq->sequence); @@ -90,7 +89,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, static void flush_sequence(struct msg_sequence **seg, int sequence_index) { struct msg_sequence *msg_seq = seg[sequence_index]; - heap_free(msg_seq->sequence); + free(msg_seq->sequence); msg_seq->sequence = NULL; msg_seq->count = msg_seq->size = 0; } @@ -110,5 +109,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = heap_alloc_zero(sizeof(struct msg_sequence)); + seq[i] = calloc(1, sizeof(**seq)); } diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index f11ae0b1923..e8c771f7eec 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -364,7 +364,7 @@ static INameSpaceTreeControlEventsImpl *create_nstc_events(void) { INameSpaceTreeControlEventsImpl *This; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); This->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_NSTCEvents; This->ref = 1; @@ -2351,8 +2351,8 @@ static void test_events(void) if(!res) { /* Freeing these prematurely causes a crash. */ - heap_free(pnstceimpl); - heap_free(pnstceimpl2); + free(pnstceimpl); + free(pnstceimpl2); } IShellItem_Release(psi);

1 0

Rémi Bernon : kernelbase: Use the same HLOCAL flags / lock layout as native.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: dee510bd32db810c89235dc5c60ba73bffb82775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dee510bd32db810c89235dc5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 4 10:02:02 2022 +0200 kernelbase: Use the same HLOCAL flags / lock layout as native. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 54 ++++++++++++++++++++++++---------------------- dlls/kernel32/tests/heap.c | 8 ------- dlls/kernelbase/memory.c | 41 +++++++++++++++++++++-------------- 3 files changed, 53 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dee510bd32db810c8923…

1 0

Rémi Bernon : kernelbase: Use the same HLOCAL entry pointer alignment as native.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: 2fcb072f0376a24ca6d3faf0fc92bddf56c137ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fcb072f0376a24ca6d3faf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 4 10:01:59 2022 +0200 kernelbase: Use the same HLOCAL entry pointer alignment as native. This changes the GlobalUnlock todo_wine as we previously considered the invalid mem handle as a valid pointer, and we now instead check handle validity. Returning TRUE in for an invalid handle doesn't seem very important, and a corner case, and it breaks compatibility and imm32 tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 10 ++++------ dlls/kernel32/tests/heap.c | 17 +---------------- dlls/kernelbase/memory.c | 10 ++++------ 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index dbb240d89fc..20505b673ec 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -147,8 +147,6 @@ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ ) * Global/local heap functions, keep in sync with kernelbase/memory.c ***********************************************************************/ -#include "pshpack1.h" - struct mem_entry { union @@ -156,15 +154,15 @@ struct mem_entry struct { WORD magic; - void *ptr; BYTE flags; BYTE lock; }; void *next_free; }; + void *ptr; }; -#include "poppack.h" +C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); struct kernelbase_global_data *kernelbase_global_data; @@ -181,7 +179,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = kernelbase_global_data; - if (!((ULONG_PTR)handle & 2)) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (mem->magic != MAGIC_LOCAL_USED) return NULL; return mem; @@ -189,7 +187,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) { - if ((ULONG_PTR)handle & 2) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1))) return NULL; return handle; } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 476be96cea8..5d6383a49e5 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -368,9 +368,7 @@ static void test_GlobalAlloc(void) mem = GlobalAlloc( GMEM_MOVEABLE, alloc_size ); ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); - todo_wine ok( ((UINT_PTR)mem & sizeof(void *)), "got unexpected entry align\n" ); - todo_wine ok( !((UINT_PTR)mem & (sizeof(void *) - 1)), "got unexpected entry align\n" ); entry = mem_entry_from_HANDLE( mem ); @@ -414,9 +412,7 @@ static void test_GlobalAlloc(void) ok( !tmp_mem, "GlobalFree failed, error %lu\n", GetLastError() ); ok( !!entry->flags, "got unexpected flags %#Ix\n", entry->flags ); ok( !((UINT_PTR)entry->flags & sizeof(void *)), "got unexpected ptr align\n" ); - todo_wine_if(sizeof(void *) == 4) ok( !((UINT_PTR)entry->flags & (sizeof(void *) - 1)), "got unexpected ptr align\n" ); - todo_wine ok( !entry->ptr, "got unexpected ptr %p\n", entry->ptr ); mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE, 0 ); @@ -543,29 +539,24 @@ static void test_GlobalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); flags = GlobalFlags( invalid_mem ); - todo_wine ok( flags == GMEM_INVALID_HANDLE, "GlobalFlags succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); size = GlobalSize( invalid_mem ); ok( size == 0, "GlobalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = GlobalLock( invalid_mem ); ok( !ptr, "GlobalLock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = GlobalUnlock( invalid_mem ); - ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); todo_wine + ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp_mem = GlobalReAlloc( invalid_mem, 0, GMEM_MOVEABLE ); ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); /* invalid pointers are caught */ @@ -889,29 +880,23 @@ static void test_LocalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); flags = LocalFlags( invalid_mem ); - todo_wine ok( flags == LMEM_INVALID_HANDLE, "LocalFlags succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); size = LocalSize( invalid_mem ); ok( size == 0, "LocalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = LocalLock( invalid_mem ); ok( !ptr, "LocalLock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = LocalUnlock( invalid_mem ); ok( !ret, "LocalUnlock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp_mem = LocalReAlloc( invalid_mem, 0, LMEM_MOVEABLE ); ok( !tmp_mem, "LocalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); /* invalid pointers are caught */ diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 5bdab31589d..086674ab41c 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -585,8 +585,6 @@ struct kernelbase_global_data struct mem_entry *mem_entries_end; }; -#include "pshpack1.h" - struct mem_entry { union @@ -594,15 +592,15 @@ struct mem_entry struct { WORD magic; - void *ptr; BYTE flags; BYTE lock; }; void *next_free; }; + void *ptr; }; -#include "poppack.h" +C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); #define MAX_MEM_HANDLES 0x10000 static struct mem_entry mem_entries[MAX_MEM_HANDLES]; @@ -626,7 +624,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = &kernelbase_global_data; - if (!((ULONG_PTR)handle & 2)) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (mem->magic != MAGIC_LOCAL_USED) return NULL; return mem; @@ -639,7 +637,7 @@ static inline HLOCAL HLOCAL_from_mem( struct mem_entry *mem ) static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) { - if ((ULONG_PTR)handle & 2) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1))) return NULL; return handle; }

1 0

Rémi Bernon : winegstreamer: Use a GstAtomicQueue for wg_transform output queue.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: b5d6c5992092fd0c96deacbe892668aba6759f93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d6c5992092fd0c96deacbe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:29 2022 +0200 winegstreamer: Use a GstAtomicQueue for wg_transform output queue. Some GStreamer video plugins such as vaapi do not expect their buffers to be appended to each other, and it breaks some of their assertions. We will also later need to queue caps change events, and the atomic queue will let us queue GstSample instead to hold the caps too. It also removes the need of a mutex or locking operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 67 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 200dd946e02..0327b92ce8e 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -50,9 +50,8 @@ struct wg_transform GstSegment segment; GstBufferList *input; guint input_max_length; - - pthread_mutex_t mutex; - GstBuffer *output; + GstAtomicQueue *output_queue; + GstBuffer *output_buffer; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -61,12 +60,7 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst GST_LOG("transform %p, buffer %p.", transform, buffer); - pthread_mutex_lock(&transform->mutex); - if (transform->output) - transform->output = gst_buffer_append(transform->output, buffer); - else - transform->output = buffer; - pthread_mutex_unlock(&transform->mutex); + gst_atomic_queue_push(transform->output_queue, buffer); return GST_FLOW_OK; } @@ -74,19 +68,24 @@ static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, Gst NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; + GstBuffer *buffer; if (transform->input) gst_buffer_list_unref(transform->input); - if (transform->output) - gst_buffer_unref(transform->output); gst_element_set_state(transform->container, GST_STATE_NULL); + + if (transform->output_buffer) + gst_buffer_unref(transform->output_buffer); + while ((buffer = gst_atomic_queue_pop(transform->output_queue))) + gst_buffer_unref(buffer); + g_object_unref(transform->their_sink); g_object_unref(transform->their_src); g_object_unref(transform->container); g_object_unref(transform->my_sink); g_object_unref(transform->my_src); - pthread_mutex_destroy(&transform->mutex); + gst_atomic_queue_unref(transform->output_queue); free(transform); return STATUS_SUCCESS; @@ -182,6 +181,8 @@ NTSTATUS wg_transform_create(void *args) goto out; if (!(transform->input = gst_buffer_list_new())) goto out; + if (!(transform->output_queue = gst_atomic_queue_new(8))) + goto out; transform->input_max_length = 1; if (!(src_caps = wg_format_to_caps(&input_format))) @@ -308,8 +309,6 @@ NTSTATUS wg_transform_create(void *args) gst_caps_unref(sink_caps); gst_caps_unref(src_caps); - pthread_mutex_init(&transform->mutex, NULL); - GST_INFO("Created winegstreamer transform %p.", transform); params->transform = transform; return STATUS_SUCCESS; @@ -327,6 +326,8 @@ out: gst_object_unref(transform->my_src); if (src_caps) gst_caps_unref(src_caps); + if (transform->output_queue) + gst_atomic_queue_unref(transform->output_queue); if (transform->input) gst_buffer_list_unref(transform->input); if (transform->container) @@ -368,10 +369,8 @@ NTSTATUS wg_transform_push_data(void *args) return STATUS_SUCCESS; } -static NTSTATUS read_transform_output_data(struct wg_transform *transform, - struct wg_sample *sample) +static NTSTATUS read_transform_output_data(GstBuffer *buffer, struct wg_sample *sample) { - GstBuffer *buffer = transform->output; GstMapInfo info; if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) @@ -392,12 +391,6 @@ static NTSTATUS read_transform_output_data(struct wg_transform *transform, gst_buffer_unmap(buffer, &info); gst_buffer_resize(buffer, sample->size, -1); - if (info.size <= sample->size) - { - gst_buffer_unref(transform->output); - transform->output = NULL; - } - GST_INFO("Copied %u bytes, sample %p, flags %#x", sample->size, sample, sample->flags); return STATUS_SUCCESS; } @@ -424,20 +417,26 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_UNSUCCESSFUL; } - sample->size = 0; - pthread_mutex_lock(&transform->mutex); - if (transform->output) - { - params->result = S_OK; - status = read_transform_output_data(transform, sample); - } - else + if (!transform->output_buffer && !(transform->output_buffer = gst_atomic_queue_pop(transform->output_queue))) { + sample->size = 0; params->result = MF_E_TRANSFORM_NEED_MORE_INPUT; - status = STATUS_SUCCESS; GST_INFO("Cannot read %u bytes, no output available", sample->max_size); + return STATUS_SUCCESS; } - pthread_mutex_unlock(&transform->mutex); - return status; + if ((status = read_transform_output_data(transform->output_buffer, sample))) + { + sample->size = 0; + return status; + } + + if (!(sample->flags & WG_SAMPLE_FLAG_INCOMPLETE)) + { + gst_buffer_unref(transform->output_buffer); + transform->output_buffer = NULL; + } + + params->result = S_OK; + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : wrc: Avoid loading locale.nls when not necessary.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: 701ed2591b4dfc5bac273b6f6c75f8fa69377fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=701ed2591b4dfc5bac273b6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 10:43:09 2022 +0200 wrc: Avoid loading locale.nls when not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 27 +++++++++++++++------------ tools/wrc/utils.c | 1 + 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 81e7a52c9a9..aeec61a06bd 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -177,29 +177,32 @@ static int parse_accel_string( const string_t *key, int flags ) */ static void put_string(const string_t *str, int isterm, language_t lang) { - int cnt, codepage; + int cnt; if (win32) { - string_t *newstr; - codepage = get_language_codepage( lang ); - newstr = convert_string_unicode( str, codepage ); - if (str->type == str_char && check_valid_utf8( str, codepage )) + if (str->type == str_char) { - print_location( &str->loc ); - warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use, maybe use --utf8?\n", - str->str.cstr, codepage ); + int codepage = get_language_codepage( lang ); + string_t *newstr = convert_string_unicode( str, codepage ); + + if (check_valid_utf8( str, codepage )) + { + print_location( &str->loc ); + warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use, maybe use --utf8?\n", + str->str.cstr, codepage ); + } + str = newstr; } - if (!isterm) put_word(newstr->size); - for(cnt = 0; cnt < newstr->size; cnt++) + if (!isterm) put_word(str->size); + for(cnt = 0; cnt < str->size; cnt++) { - WCHAR c = newstr->str.wstr[cnt]; + WCHAR c = str->str.wstr[cnt]; if (isterm && !c) break; put_word(c); } if (isterm) put_word(0); - free_string(newstr); } else { diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 3aaecdd1f78..bafc763692a 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -385,6 +385,7 @@ int get_language_codepage( language_t lang ) const NLS_LOCALE_LCID_INDEX *entry; if (!lang) return 1252; + if (lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) return 1252; if (!locale_table) load_locale_nls(); if (!(entry = find_lcid_entry( lang ))) return -1; return get_locale_data( entry->idx )->idefaultansicodepage;

1 0

Rémi Bernon : winegstreamer: Return S_OK from H264 decoder ProcessMessage.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: 55282e0d0988b66809ddb58b9f3b7449f8284fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55282e0d0988b66809ddb58b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:31 2022 +0200 winegstreamer: Return S_OK from H264 decoder ProcessMessage. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 - dlls/winegstreamer/h264_decoder.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d6a504a1a68..31a84e47bc1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6862,7 +6862,6 @@ static void test_h264_decoder(void) i++; hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0); - todo_wine ok(hr == S_OK, "ProcessMessage returned %#lx\n", hr); } todo_wine diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 950d9ebf335..8bfa15529db 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -491,7 +491,7 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { FIXME("iface %p, message %#x, param %Ix stub!\n", iface, message, param); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder Process(Input|Output).
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: ebd2b7d7049e46b37caad7b0235064d1a7ec3104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebd2b7d7049e46b37caad7b0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:30 2022 +0200 winegstreamer: Implement H264 decoder Process(Input|Output). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ++--- dlls/winegstreamer/h264_decoder.c | 54 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 48eeeeffde2..d6a504a1a68 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6822,7 +6822,6 @@ static void test_h264_decoder(void) status = 0; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == E_INVALIDARG || hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %lu\n", output.dwStreamID); ok(!output.pSample, "got pSample %p\n", output.pSample); @@ -6850,14 +6849,12 @@ static void test_h264_decoder(void) ok(ret == 0, "Release returned %lu\n", ret); hr = IMFTransform_ProcessInput(transform, 0, sample, 0); - todo_wine ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); ret = IMFSample_Release(sample); ok(ret <= 1, "Release returned %lu\n", ret); sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); hr = IMFTransform_ProcessInput(transform, 0, sample, 0); - todo_wine ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); ret = IMFSample_Release(sample); ok(ret <= 1, "Release returned %lu\n", ret); @@ -6883,7 +6880,8 @@ static void test_h264_decoder(void) todo_wine ok(status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS, "got status %#lx\n", status); - check_sample(output.pSample, NULL, 0, NULL); + if (status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS) + check_sample(output.pSample, NULL, 0, NULL); ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 4edd4cdf39c..950d9ebf335 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -496,15 +496,61 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { - FIXME("iface %p, id %#lx, sample %p, flags %#lx stub!\n", iface, id, sample, flags); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + struct wg_sample *wg_sample; + MFT_INPUT_STREAM_INFO info; + HRESULT hr; + + TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); + + if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) + return hr; + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = mf_create_wg_sample(sample, &wg_sample))) + return hr; + + hr = wg_transform_push_data(decoder->wg_transform, wg_sample); + + mf_destroy_wg_sample(wg_sample); + return hr; } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { - FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + MFT_OUTPUT_STREAM_INFO info; + struct wg_sample *wg_sample; + HRESULT hr; + + TRACE("iface %p, flags %#lx, count %lu, samples %p, status %p.\n", iface, flags, count, samples, status); + + if (count != 1) + return E_INVALIDARG; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(iface, 0, &info))) + return hr; + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + *status = 0; + samples[0].dwStatus = 0; + if (!samples[0].pSample) return E_INVALIDARG; + + if (FAILED(hr = mf_create_wg_sample(samples[0].pSample, &wg_sample))) + return hr; + + if (wg_sample->max_size < info.cbSize) + hr = MF_E_BUFFERTOOSMALL; + else + hr = wg_transform_read_data(decoder->wg_transform, wg_sample); + + mf_destroy_wg_sample(wg_sample); + return hr; } static const IMFTransformVtbl transform_vtbl =

1 0

Piotr Caban : msvcr100: Improve ThreadScheduler_ScheduleTask_loc stub.
by Alexandre Julliard April 4, 2022

April 4, 2022

Module: wine Branch: master Commit: 2d2dba53740a3bf6407e19c33e530a84945aceff URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d2dba53740a3bf6407e19c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Apr 3 20:30:41 2022 +0200 msvcr100: Improve ThreadScheduler_ScheduleTask_loc stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45916 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 54b2c49db99..2ca6421b0e7 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1220,11 +1220,45 @@ DEFINE_THISCALL_WRAPPER(ThreadScheduler_CreateScheduleGroup, 4) return NULL; } +typedef struct +{ + void (__cdecl *proc)(void*); + void *data; +} schedule_task_arg; + +static void WINAPI schedule_task_proc(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) +{ + schedule_task_arg arg; + + arg = *(schedule_task_arg*)context; + operator_delete(context); + arg.proc(arg.data); +} + DEFINE_THISCALL_WRAPPER(ThreadScheduler_ScheduleTask_loc, 16) void __thiscall ThreadScheduler_ScheduleTask_loc(ThreadScheduler *this, void (__cdecl *proc)(void*), void* data, /*location*/void *placement) { + schedule_task_arg *arg; + TP_WORK *work; + FIXME("(%p %p %p %p) stub\n", this, proc, data, placement); + + arg = operator_new(sizeof(*arg)); + arg->proc = proc; + arg->data = data; + + work = CreateThreadpoolWork(schedule_task_proc, arg, NULL); + if(!work) { + scheduler_resource_allocation_error e; + + operator_delete(arg); + scheduler_resource_allocation_error_ctor_name(&e, NULL, + HRESULT_FROM_WIN32(GetLastError())); + _CxxThrowException(&e, &scheduler_resource_allocation_error_exception_type); + } + SubmitThreadpoolWork(work); + CloseThreadpoolWork(work); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_ScheduleTask, 12) @@ -1232,6 +1266,7 @@ void __thiscall ThreadScheduler_ScheduleTask(ThreadScheduler *this, void (__cdecl *proc)(void*), void* data) { FIXME("(%p %p %p) stub\n", this, proc, data); + ThreadScheduler_ScheduleTask_loc(this, proc, data, NULL); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_IsAvailableLocation, 8)

1 0