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

Rémi Bernon : kernel32/tests: Add some HGLOBAL/HLOCAL limits tests.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: d32bc81ea4d745c9725239329543a2810a8354f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d32bc81ea4d745c972523932… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 11:35:57 2022 +0200 kernel32/tests: Add some HGLOBAL/HLOCAL limits tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index b2dc111708b..76a60a897b3 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -257,6 +257,7 @@ static void test_GlobalAlloc(void) static const SIZE_T buffer_size = ARRAY_SIZE(zero_buffer); const HGLOBAL invalid_mem = LongToHandle( 0xdeadbee0 + sizeof(void *) ); void *const invalid_ptr = LongToHandle( 0xdeadbee0 ); + HGLOBAL globals[0x10000]; HGLOBAL mem, tmp_mem; BYTE *ptr, *tmp_ptr; UINT i, flags; @@ -268,6 +269,37 @@ static void test_GlobalAlloc(void) mem = GlobalReAlloc( 0, 10, GMEM_MOVEABLE ); ok( !mem, "GlobalReAlloc succeeded\n" ); + for (i = 0; i < ARRAY_SIZE(globals); ++i) + { + mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE, 0 ); + ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); + globals[i] = mem; + } + + SetLastError( 0xdeadbeef ); + mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE, 0 ); + todo_wine + ok( !mem, "GlobalAlloc succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + mem = LocalAlloc( LMEM_MOVEABLE | LMEM_DISCARDABLE, 0 ); + todo_wine + ok( !mem, "LocalAlloc succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "got error %lu\n", GetLastError() ); + + mem = GlobalAlloc( GMEM_DISCARDABLE, 0 ); + ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); + mem = GlobalFree( mem ); + ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE(globals); ++i) + { + mem = GlobalFree( globals[i] ); + ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); + } + mem = GlobalAlloc( GMEM_MOVEABLE, 0 ); ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); mem = GlobalReAlloc( mem, 10, GMEM_MOVEABLE ); @@ -593,6 +625,7 @@ static void test_LocalAlloc(void) static const SIZE_T buffer_size = ARRAY_SIZE(zero_buffer); const HLOCAL invalid_mem = LongToHandle( 0xdeadbee0 + sizeof(void *) ); void *const invalid_ptr = LongToHandle( 0xdeadbee0 ); + HLOCAL locals[0x10000]; HLOCAL mem, tmp_mem; BYTE *ptr, *tmp_ptr; UINT i, flags; @@ -604,6 +637,37 @@ static void test_LocalAlloc(void) mem = LocalReAlloc( 0, 10, LMEM_MOVEABLE ); ok( !mem, "LocalReAlloc succeeded\n" ); + for (i = 0; i < ARRAY_SIZE(locals); ++i) + { + mem = LocalAlloc( LMEM_MOVEABLE | LMEM_DISCARDABLE, 0 ); + ok( !!mem, "LocalAlloc failed, error %lu\n", GetLastError() ); + locals[i] = mem; + } + + SetLastError( 0xdeadbeef ); + mem = LocalAlloc( LMEM_MOVEABLE | LMEM_DISCARDABLE, 0 ); + todo_wine + ok( !mem, "LocalAlloc succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE, 0 ); + todo_wine + ok( !mem, "GlobalAlloc succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "got error %lu\n", GetLastError() ); + + mem = LocalAlloc( LMEM_DISCARDABLE, 0 ); + ok( !!mem, "LocalAlloc failed, error %lu\n", GetLastError() ); + mem = LocalFree( mem ); + ok( !mem, "LocalFree failed, error %lu\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE(locals); ++i) + { + mem = LocalFree( locals[i] ); + ok( !mem, "LocalFree failed, error %lu\n", GetLastError() ); + } + mem = LocalAlloc( LMEM_MOVEABLE, 0 ); ok( !!mem, "LocalAlloc failed, error %lu\n", GetLastError() ); mem = LocalReAlloc( mem, 10, LMEM_MOVEABLE );

1 0

Rémi Bernon : kernel32/tests: Add some HGLOBAL/HLOCAL entry layout tests.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: d31be111aab8f8f8dad21c84a18563322bfa0569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d31be111aab8f8f8dad21c84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 11:35:58 2022 +0200 kernel32/tests: Add some HGLOBAL/HLOCAL entry layout tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 143 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 76a60a897b3..f6fb95cdddd 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -240,6 +240,17 @@ static void test_HeapCreate(void) } +struct mem_entry +{ + UINT_PTR flags; + void *ptr; +}; + +static struct mem_entry *mem_entry_from_HANDLE( HLOCAL handle ) +{ + return CONTAINING_RECORD( handle, struct mem_entry, ptr ); +} + static void test_GlobalAlloc(void) { static const UINT flags_tests[] = @@ -257,11 +268,12 @@ static void test_GlobalAlloc(void) static const SIZE_T buffer_size = ARRAY_SIZE(zero_buffer); const HGLOBAL invalid_mem = LongToHandle( 0xdeadbee0 + sizeof(void *) ); void *const invalid_ptr = LongToHandle( 0xdeadbee0 ); + struct mem_entry *entry; HGLOBAL globals[0x10000]; + SIZE_T size, alloc_size; HGLOBAL mem, tmp_mem; BYTE *ptr, *tmp_ptr; UINT i, flags; - SIZE_T size; BOOL ret; mem = GlobalFree( 0 ); @@ -319,6 +331,135 @@ static void test_GlobalAlloc(void) size = GlobalSize( mem ); ok( size == 0, "GlobalSize returned %Iu\n", size ); + mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE, 0 ); + ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); + entry = mem_entry_from_HANDLE( mem ); + size = GlobalSize( mem ); + ok( size == 0, "GlobalSize returned %Iu\n", size ); + ret = HeapValidate( GetProcessHeap(), 0, entry ); + ok( !ret, "HeapValidate succeeded\n" ); + todo_wine + ok( entry->flags == 0xf, "got unexpected flags %#Ix\n", entry->flags ); + ok( !entry->ptr, "got unexpected ptr %p\n", entry->ptr ); + mem = GlobalFree( mem ); + ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); + + mem = GlobalAlloc( GMEM_MOVEABLE, 0 ); + ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); + entry = mem_entry_from_HANDLE( mem ); + size = GlobalSize( mem ); + ok( size == 0, "GlobalSize returned %Iu\n", size ); + ret = HeapValidate( GetProcessHeap(), 0, entry ); + ok( !ret, "HeapValidate succeeded\n" ); + todo_wine + ok( entry->flags == 0xb, "got unexpected flags %#Ix\n", entry->flags ); + ok( !entry->ptr, "got unexpected ptr %p\n", entry->ptr ); + mem = GlobalFree( mem ); + ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); + + for (alloc_size = 1; alloc_size < 0x10000000; alloc_size <<= 1) + { + winetest_push_context( "size %#Ix", alloc_size ); + + mem = GlobalAlloc( GMEM_FIXED, alloc_size ); + ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); + ok( !((UINT_PTR)mem & sizeof(void *)), "got unexpected ptr align\n" ); + ok( !((UINT_PTR)mem & (sizeof(void *) - 1)), "got unexpected ptr align\n" ); + ret = HeapValidate( GetProcessHeap(), 0, mem ); + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); + tmp_mem = GlobalFree( mem ); + ok( !tmp_mem, "GlobalFree failed, error %lu\n", GetLastError() ); + + 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 ); + ret = HeapValidate( GetProcessHeap(), 0, entry ); + ok( !ret, "HeapValidate succeeded\n" ); + ret = HeapValidate( GetProcessHeap(), 0, entry->ptr ); + todo_wine + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); + size = HeapSize( GetProcessHeap(), 0, entry->ptr ); + todo_wine + ok( size == alloc_size, "HeapSize returned %Iu\n", size ); + + ptr = GlobalLock( mem ); + ok( !!ptr, "GlobalLock failed, error %lu\n", GetLastError() ); + ok( ptr != mem, "got unexpected ptr %p\n", ptr ); + ok( ptr == entry->ptr, "got unexpected ptr %p\n", ptr ); + ok( !((UINT_PTR)ptr & sizeof(void *)), "got unexpected ptr align\n" ); + ok( !((UINT_PTR)ptr & (sizeof(void *) - 1)), "got unexpected ptr align\n" ); + for (i = 1; i < 0xff; ++i) + { + todo_wine + ok( entry->flags == ((i<<16)|3), "got unexpected flags %#Ix\n", entry->flags ); + ptr = GlobalLock( mem ); + ok( !!ptr, "GlobalLock failed, error %lu\n", GetLastError() ); + } + ptr = GlobalLock( mem ); + ok( !!ptr, "GlobalLock failed, error %lu\n", GetLastError() ); + todo_wine + ok( entry->flags == 0xff0003, "got unexpected flags %#Ix\n", entry->flags ); + for (i = 1; i < 0xff; ++i) + { + ret = GlobalUnlock( mem ); + ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); + } + ret = GlobalUnlock( mem ); + ok( !ret, "GlobalUnlock succeeded, error %lu\n", GetLastError() ); + todo_wine + ok( entry->flags == 0x3, "got unexpected flags %#Ix\n", entry->flags ); + + tmp_mem = GlobalFree( mem ); + ok( !tmp_mem, "GlobalFree failed, error %lu\n", GetLastError() ); + ok( !!entry->flags, "got unexpected flags %#Ix\n", entry->flags ); + todo_wine_if(sizeof(void *) == 4) + 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 ); + ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); + entry = mem_entry_from_HANDLE( mem ); + todo_wine + ok( entry->flags == 0xf, "got unexpected flags %#Ix\n", entry->flags ); + ok( !entry->ptr, "got unexpected ptr %p\n", entry->ptr ); + flags = GlobalFlags( mem ); + ok( flags == (GMEM_DISCARDED | GMEM_DISCARDABLE), "GlobalFlags returned %#x, error %lu\n", flags, GetLastError() ); + mem = GlobalFree( mem ); + ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); + + mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE, 1 ); + ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); + entry = mem_entry_from_HANDLE( mem ); + todo_wine + ok( entry->flags == 0x7, "got unexpected flags %#Ix\n", entry->flags ); + ok( !!entry->ptr, "got unexpected ptr %p\n", entry->ptr ); + flags = GlobalFlags( mem ); + ok( flags == GMEM_DISCARDABLE, "GlobalFlags returned %#x, error %lu\n", flags, GetLastError() ); + mem = GlobalFree( mem ); + ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); + + mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE | GMEM_DDESHARE, 1 ); + ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); + entry = mem_entry_from_HANDLE( mem ); + todo_wine + ok( entry->flags == 0x8007, "got unexpected flags %#Ix\n", entry->flags ); + ok( !!entry->ptr, "got unexpected ptr %p\n", entry->ptr ); + flags = GlobalFlags( mem ); + ok( flags == (GMEM_DISCARDABLE | GMEM_DDESHARE), "GlobalFlags returned %#x, error %lu\n", flags, GetLastError() ); + mem = GlobalFree( mem ); + ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); + + winetest_pop_context(); + } + mem = GlobalAlloc( GMEM_MOVEABLE, 256 ); ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); ptr = GlobalLock( mem );

1 0

Zebediah Figura : maintainers: Update the path to strmbase.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: aa5e4c09fc46bc08c4f7239f82df1e03c504a391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa5e4c09fc46bc08c4f7239f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 28 14:06:41 2022 -0500 maintainers: Update the path to strmbase. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9ceae9e80bf..14fe2e0cb9b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -109,8 +109,8 @@ F: dlls/qcap/ F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ -F: dlls/strmbase/ F: dlls/winegstreamer/quartz_parser.c +F: libs/strmbase/ DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com>

1 0

Nikolay Sivov : dbgeng: Use CRT allocation functions.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: adaa984b7bb78a6d31eba824e6a2dff153fd2cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adaa984b7bb78a6d31eba824… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 28 14:24:59 2022 +0300 dbgeng: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 880b6f03b43..1439cedfeb3 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -31,7 +31,6 @@ #include "dbgeng.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dbgeng); @@ -149,12 +148,12 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) count = needed / sizeof(HMODULE); - if (!(modules = heap_alloc(count * sizeof(*modules)))) + if (!(modules = calloc(count, sizeof(*modules)))) return E_OUTOFMEMORY; - if (!(target->modules.info = heap_alloc_zero(count * sizeof(*target->modules.info)))) + if (!(target->modules.info = calloc(count, sizeof(*target->modules.info)))) { - heap_free(modules); + free(modules); return E_OUTOFMEMORY; } @@ -179,7 +178,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) target->cpu_type = debug_target_get_module_machine(target, modules[0]); - heap_free(modules); + free(modules); target->modules.loaded = count; target->modules.unloaded = 0; /* FIXME */ @@ -331,8 +330,8 @@ static ULONG STDMETHODCALLTYPE debugclient_AddRef(IDebugClient7 *iface) static void debug_target_free(struct target_process *target) { - heap_free(target->modules.info); - heap_free(target); + free(target->modules.info); + free(target); } static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) @@ -353,7 +352,7 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) } if (debug_client->event_callbacks) debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); - heap_free(debug_client); + free(debug_client); } return refcount; @@ -443,7 +442,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient7 *iface, return E_NOTIMPL; } - if (!(process = heap_alloc_zero(sizeof(*process)))) + if (!(process = calloc(1, sizeof(*process)))) return E_OUTOFMEMORY; process->pid = pid; @@ -1900,7 +1899,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug if (!(size = GetFileVersionInfoSizeA(info->image_name, &handle))) return E_FAIL; - if (!(version_info = heap_alloc(size))) + if (!(version_info = malloc(size))) return E_OUTOFMEMORY; if (GetFileVersionInfoA(info->image_name, handle, size, version_info)) @@ -1921,7 +1920,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug } } - heap_free(version_info); + free(version_info); return hr; } @@ -4033,8 +4032,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) TRACE("%s, %p.\n", debugstr_guid(riid), obj); - debug_client = heap_alloc_zero(sizeof(*debug_client)); - if (!debug_client) + if (!(debug_client = calloc(1, sizeof(*debug_client)))) return E_OUTOFMEMORY; debug_client->IDebugClient_iface.lpVtbl = &debugclientvtbl;

1 0

Nikolay Sivov : mf/session: Trace seek position in Start().
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 3f84ee1eb6637602e3e95fee20985444639b4602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f84ee1eb6637602e3e95fee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 28 14:57:04 2022 +0300 mf/session: Trace seek position in Start(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf_private.h | 34 ++++++++++++++++++++++++++++++++++ dlls/mf/session.c | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index db6f101cd6d..6f28c93aea3 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -79,6 +79,40 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } +static inline const char *debugstr_propvar(const PROPVARIANT *v) +{ + if (!v) + return "(null)"; + + switch (v->vt) + { + case VT_EMPTY: + return wine_dbg_sprintf("%p {VT_EMPTY}", v); + case VT_NULL: + return wine_dbg_sprintf("%p {VT_NULL}", v); + case VT_UI4: + return wine_dbg_sprintf("%p {VT_UI4: %ld}", v, v->ulVal); + case VT_UI8: + return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); + case VT_I8: + return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); + case VT_R4: + return wine_dbg_sprintf("%p {VT_R4: %.8e}", v, v->fltVal); + case VT_R8: + return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); + case VT_CLSID: + return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, wine_dbgstr_guid(v->puuid)); + case VT_LPWSTR: + return wine_dbg_sprintf("%p {VT_LPWSTR: %s}", v, wine_dbgstr_w(v->pwszVal)); + case VT_VECTOR | VT_UI1: + return wine_dbg_sprintf("%p {VT_VECTOR|VT_UI1: %p}", v, v->caub.pElems); + case VT_UNKNOWN: + return wine_dbg_sprintf("%p {VT_UNKNOWN: %p}", v, v->punkVal); + default: + return wine_dbg_sprintf("%p {vt %#x}", v, v->vt); + } +} + extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; extern BOOL mf_is_sar_sink(IMFMediaSink *sink) 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 29dae316ce0..85cbcc29630 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2009,7 +2009,7 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format struct session_op *op; HRESULT hr; - TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), start_position); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), debugstr_propvar(start_position)); if (!start_position) return E_POINTER;

1 0

Matteo Bruni : d3dcompiler: Set initial_filename in D3DCompile2().
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 8a7651fd36ebf9850cc63327f465859b70cc40b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a7651fd36ebf9850cc63327… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 14:12:15 2022 +0200 d3dcompiler: Set initial_filename in D3DCompile2(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4d2642f17e3..ba7789f45a8 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -891,6 +891,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen preprocess_info.pfn_open_include = open_include; preprocess_info.pfn_close_include = close_include; preprocess_info.include_context = include; + initial_filename = filename ? filename : ""; hlsl_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; hlsl_info.next = NULL;

1 0

Matteo Bruni : d3dx11/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: f26fa0465626561bc531dfda32a9e90e9d52c3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26fa0465626561bc531dfda… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 14:12:16 2022 +0200 d3dx11/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index 357a84ce457..47451e7fff2 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -577,7 +577,12 @@ static void test_D3DX11CompileFromFile(void) "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (errors) + { + ID3D10Blob_Release(errors); + errors = NULL; + } if (blob) { ID3D10Blob_Release(blob); @@ -590,7 +595,12 @@ static void test_D3DX11CompileFromFile(void) hr = D3DX11CompileFromFileW(filename, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (errors) + { + ID3D10Blob_Release(errors); + errors = NULL; + } if (blob) { ID3D10Blob_Release(blob); @@ -602,7 +612,12 @@ static void test_D3DX11CompileFromFile(void) hr = D3DX11CompileFromFileA(filename_a, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (errors) + { + ID3D10Blob_Release(errors); + errors = NULL; + } if (blob) { ID3D10Blob_Release(blob); @@ -615,7 +630,12 @@ static void test_D3DX11CompileFromFile(void) hr = D3DX11CompileFromFileW(L"source.ps", NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result); todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (errors) + { + ID3D10Blob_Release(errors); + errors = NULL; + } if (blob) { ID3D10Blob_Release(blob);

1 0

Matteo Bruni : d3dx9/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 8956862e0a7fec92a983a455ea902a61f83d28da URL: https://source.winehq.org/git/wine.git/?a=commit;h=8956862e0a7fec92a983a455… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 14:12:17 2022 +0200 d3dx9/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52721 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 285bca1cdae..12af35cb8d8 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8105,7 +8105,7 @@ static void test_create_effect_from_file(void) /* This is apparently broken on native, it ends up using the wrong include. */ hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL, 0, NULL, &effect, &messages); - todo_wine ok(hr == E_FAIL, "Unexpected error, hr %#x.\n", hr); + ok(hr == E_FAIL, "Unexpected error, hr %#x.\n", hr); if (messages) { trace("D3DXCreateEffectFromFileExW messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); @@ -8130,7 +8130,7 @@ static void test_create_effect_from_file(void) * is "ID3DXEffectCompiler: There were no techniques" */ hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, &include.ID3DXInclude_iface, NULL, 0, NULL, &effect, &messages); - todo_wine ok(hr == E_FAIL, "D3DXInclude test failed with error %#x.\n", hr); + ok(hr == E_FAIL, "D3DXInclude test failed with error %#x.\n", hr); if (messages) { trace("D3DXCreateEffectFromFileExW messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages));

1 0

Matteo Bruni : d3dcompiler: Always use vkd3d-shader's preprocessor.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 9400874e3c64036700804a99af0e2940bc4d6622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9400874e3c64036700804a99… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 14:12:18 2022 +0200 d3dcompiler: Always use vkd3d-shader's preprocessor. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_33/Makefile.in | 9 +- dlls/d3dcompiler_34/Makefile.in | 9 +- dlls/d3dcompiler_35/Makefile.in | 9 +- dlls/d3dcompiler_36/Makefile.in | 9 +- dlls/d3dcompiler_37/Makefile.in | 9 +- dlls/d3dcompiler_38/Makefile.in | 9 +- dlls/d3dcompiler_39/Makefile.in | 9 +- dlls/d3dcompiler_40/Makefile.in | 9 +- dlls/d3dcompiler_41/Makefile.in | 9 +- dlls/d3dcompiler_42/Makefile.in | 9 +- dlls/d3dcompiler_43/Makefile.in | 7 +- dlls/d3dcompiler_43/compiler.c | 652 +++----------- dlls/d3dcompiler_43/ppl.l | 1547 --------------------------------- dlls/d3dcompiler_43/ppy.y | 689 --------------- dlls/d3dcompiler_43/preproc.c | 447 ---------- dlls/d3dcompiler_43/tests/asm.c | 15 +- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 3 +- dlls/d3dcompiler_43/wpp_private.h | 251 ------ dlls/d3dcompiler_46/Makefile.in | 9 +- dlls/d3dcompiler_47/Makefile.in | 9 +- dlls/d3dx9_36/tests/asm.c | 2 +- 21 files changed, 154 insertions(+), 3567 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9400874e3c6403670080…

1 0

Matteo Bruni : d3dx9/tests: Increase tolerance in a quaternion test.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 9cb65cb025e0578c1883abb96f2cd8f9ef6813ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb65cb025e0578c1883abb9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 14:12:19 2022 +0200 d3dx9/tests: Increase tolerance in a quaternion test. It currently fails for me on 32-bit Linux. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 501895665f7..564e61040e7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1848,7 +1848,7 @@ static void D3DXQuaternionTest(void) u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &u); expectedquat.x = 7.121285f; expectedquat.y = 2.159964f; expectedquat.z = -3.855094f; expectedquat.w = 5.362844f; - expect_quaternion(&expectedquat, &gotquat, 2); + expect_quaternion(&expectedquat, &gotquat, 16); expectedquat.x = -1113.492920f; expectedquat.y = 82.679260f; expectedquat.z = -6.696645f; expectedquat.w = -4.090050f; expect_quaternion(&expectedquat, &Nq, 4); expectedquat.x = -1111.0f; expectedquat.y = 111.0f; expectedquat.z = -11.0f; expectedquat.w = 1.0f;

1 0