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

Gijs Vermeulen : amstream: Implement AMMediaStream::JoinFilterGraph.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: c6b437284554a77c9510873c90cd1c7055e845f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b437284554a77c9510873c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jul 13 19:08:45 2020 +0200 amstream: Implement AMMediaStream::JoinFilterGraph. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 6 +++--- dlls/amstream/ddrawstream.c | 6 +++--- dlls/amstream/tests/amstream.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 60a2572b3b..112891eeb7 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -593,11 +593,11 @@ static HRESULT WINAPI audio_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMe static HRESULT WINAPI audio_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + TRACE("stream %p, filtergraph %p.\n", stream, filtergraph); - return S_FALSE; + return S_OK; } static const struct IAMMediaStreamVtbl audio_IAMMediaStream_vtbl = diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5530603f7a..9f74eaf91a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -261,11 +261,11 @@ static HRESULT WINAPI ddraw_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMe static HRESULT WINAPI ddraw_IAMMediaStream_JoinFilterGraph(IAMMediaStream *iface, IFilterGraph *filtergraph) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, filtergraph); + TRACE("stream %p, filtergraph %p.\n", stream, filtergraph); - return S_FALSE; + return S_OK; } static const struct IAMMediaStreamVtbl ddraw_IAMMediaStream_vtbl = diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a0876d6242..a81cdba3f3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4371,7 +4371,7 @@ static void check_ammediastream_join_filter_graph(const MSPID *id) } hr = IAMMediaStream_JoinFilterGraph(stream, graph); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); EXPECT_REF(builder, 4); EXPECT_REF(graph, 1);

1 0

Nikolay Sivov : evr/tests: Fix test crash on Windows 7.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: ea53b3c22e60a17c595cd2c463d3092ec123422d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea53b3c22e60a17c595cd2c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:40:57 2020 +0300 evr/tests: Fix test crash on Windows 7. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5e18494718..6a5d80df41 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1080,15 +1080,18 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); - /* Device manager wasn't set, sample get regular memory buffers. */ - hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + /* Device manager wasn't set, sample gets regular memory buffers. */ + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + } IMFMediaBuffer_Release(buffer); - IMFGetService_Release(gs); IMFSample_Release(sample); }

1 0

Zebediah Figura : qcap/smartteefilter: Return VFW_S_CANT_CUE from GetState() if paused.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 44cd11ef4ab3675dd8a7598d2ee66eb658092eb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cd11ef4ab3675dd8a7598d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:19 2020 -0500 qcap/smartteefilter: Return VFW_S_CANT_CUE from GetState() if paused. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 6 ++++++ dlls/qcap/tests/smartteefilter.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 5b4add0b5d..2f6f3ab2b7 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -62,10 +62,16 @@ static void smart_tee_destroy(struct strmbase_filter *iface) CoTaskMemFree(filter); } +static HRESULT smart_tee_wait_state(struct strmbase_filter *iface, DWORD timeout) +{ + return iface->state == State_Paused ? VFW_S_CANT_CUE : S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = smart_tee_get_pin, .filter_destroy = smart_tee_destroy, + .filter_wait_state = smart_tee_wait_state, }; static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *pmt) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 2f8fa6c4b5..f3a44c67c1 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2232,7 +2232,7 @@ static void test_unconnected_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); - todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); @@ -2246,7 +2246,7 @@ static void test_unconnected_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); - todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter);

1 0

Alistair Leslie-Hughes : ws2_32: Trace SIO_IDEAL_SEND_BACKLOG_* calls.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: da6386df8b759672e051304711bb6a5dc6ce9bd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6386df8b759672e0513047… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 14 09:03:47 2020 +1000 ws2_32: Trace SIO_IDEAL_SEND_BACKLOG_* calls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- include/ws2ipdef.h | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 69fbb37af2..d7eddde44d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4554,8 +4554,8 @@ static const char *debugstr_wsaioctl(DWORD code) IOCTL_NAME(WS_SIO_GET_INTERFACE_LIST); /* IOCTL_NAME(WS_SIO_GET_INTERFACE_LIST_EX); */ IOCTL_NAME(WS_SIO_GET_QOS); - /* IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_CHANGE); - IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_QUERY); */ + IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_CHANGE); + IOCTL_NAME(WS_SIO_IDEAL_SEND_BACKLOG_QUERY); IOCTL_NAME(WS_SIO_KEEPALIVE_VALS); IOCTL_NAME(WS_SIO_MULTIPOINT_LOOPBACK); IOCTL_NAME(WS_SIO_MULTICAST_SCOPE); diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 4cae361e5f..fc46580496 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -282,6 +282,14 @@ typedef struct WS(in_pktinfo) { #define SS_PORT(ssp) (((PSOCKADDR_IN)(ssp))->sin_port) +#ifndef USE_WS_PREFIX +#define SIO_IDEAL_SEND_BACKLOG_CHANGE _IO ('t', 122) +#define SIO_IDEAL_SEND_BACKLOG_QUERY _IOR('t', 123, ULONG) +#else +#define WS_SIO_IDEAL_SEND_BACKLOG_CHANGE WS__IO ('t', 122) +#define WS_SIO_IDEAL_SEND_BACKLOG_QUERY WS__IOR('t', 123, ULONG) +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Brendan Shanks : winevulkan: Export VK_KHR_get_surface_capabilities2 functions from vulkan-1.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 314cd9cdd542db658ce7a01ef0a7621fc2d9d335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=314cd9cdd542db658ce7a01e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 13 11:45:30 2020 -0700 winevulkan: Export VK_KHR_get_surface_capabilities2 functions from vulkan-1. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 2 ++ dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winevulkan/winevulkan.spec | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index e8fb64d82b..026bd99dec 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -179,7 +179,9 @@ @ stdcall vkGetPhysicalDeviceQueueFamilyProperties2(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties2 @ stdcall vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties @ stdcall vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSparseImageFormatProperties2 +@ stdcall vkGetPhysicalDeviceSurfaceCapabilities2KHR(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR @ stdcall vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR +@ stdcall vkGetPhysicalDeviceSurfaceFormats2KHR(ptr ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormats2KHR @ stdcall vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceFormatsKHR @ stdcall vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetPhysicalDeviceSurfacePresentModesKHR @ stdcall vkGetPhysicalDeviceSurfaceSupportKHR(ptr long int64 ptr) winevulkan.wine_vkGetPhysicalDeviceSurfaceSupportKHR diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b84eb39587..04b263e3e4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -130,6 +130,7 @@ UNSUPPORTED_EXTENSIONS = [ CORE_EXTENSIONS = [ "VK_KHR_display", "VK_KHR_display_swapchain", + "VK_KHR_get_surface_capabilities2", "VK_KHR_surface", "VK_KHR_swapchain", "VK_KHR_win32_surface", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 94aa1e3fb7..06d79b8fae 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4939,7 +4939,7 @@ static VkResult WINAPI wine_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesC return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(physicalDevice->phys_dev, pCombinationCount, pCombinations); } -static VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) { #if defined(USE_STRUCT_CONVERSION) VkResult result; @@ -4962,7 +4962,7 @@ VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice->phys_dev, surface, pSurfaceCapabilities); } -static VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, uint32_t *pSurfaceFormatCount, VkSurfaceFormat2KHR *pSurfaceFormats) +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, uint32_t *pSurfaceFormatCount, VkSurfaceFormat2KHR *pSurfaceFormats) { #if defined(USE_STRUCT_CONVERSION) VkResult result; diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 44ac8c6d2f..383e6b9b8f 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -182,7 +182,9 @@ @ stdcall -private wine_vkGetPhysicalDeviceQueueFamilyProperties2(ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSparseImageFormatProperties(ptr long long long long long ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSparseImageFormatProperties2(ptr ptr ptr ptr) +@ stdcall -private wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(ptr int64 ptr) +@ stdcall -private wine_vkGetPhysicalDeviceSurfaceFormats2KHR(ptr ptr ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceFormatsKHR(ptr int64 ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfacePresentModesKHR(ptr int64 ptr ptr) @ stdcall -private wine_vkGetPhysicalDeviceSurfaceSupportKHR(ptr long int64 ptr)

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the buffer in get_device_mount_point().
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: b2d38f15314e39eeb17ec5e02bc6fe78b26420e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2d38f15314e39eeb17ec5e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:33:05 2020 +0200 ntdll: Use malloc() to allocate the buffer in get_device_mount_point(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 0b9ad4bc22..cee9800fc8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -947,8 +947,7 @@ static char *get_device_mount_point( dev_t dev ) if (device && !stat( device, &st ) && S_ISBLK(st.st_mode) && st.st_rdev == dev) { - ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(entry->mnt_dir) + 1 ); - if (ret) strcpy( ret, entry->mnt_dir ); + ret = strdup( entry->mnt_dir ); break; } } @@ -968,8 +967,7 @@ static char *get_device_mount_point( dev_t dev ) if (stat( entry[i].f_mntfromname, &st ) == -1) continue; if (S_ISBLK(st.st_mode) && st.st_rdev == dev) { - ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(entry[i].f_mntonname) + 1 ); - if (ret) strcpy( ret, entry[i].f_mntonname ); + ret = strdup( entry[i].f_mntonname ); break; } } @@ -1089,11 +1087,11 @@ static int get_dir_case_sensitivity_attr( const char *dir ) attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0) { - RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); + free( mntpoint ); add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE ); return TRUE; } - RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); + free( mntpoint ); if (caps.size == sizeof(caps) && (caps.caps.valid[VOL_CAPABILITIES_FORMAT] & (VOL_CAP_FMT_CASE_SENSITIVE | VOL_CAP_FMT_CASE_PRESERVING)) == @@ -3500,7 +3498,7 @@ static NTSTATUS unmount_device( HANDLE handle ) if (major(st.st_rdev) == LOOP_MAJOR) ioctl( unix_fd, 0x4c01 /*LOOP_CLR_FD*/, 0 ); #endif } - RtlFreeHeap( GetProcessHeap(), 0, mount_point ); + free( mount_point ); } } if (needs_close) close( unix_fd );

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the directory cache.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: e9abe3f7395a81dcb6d192b48bd54848dc4f2b5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9abe3f7395a81dcb6d192b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:33:18 2020 +0200 ntdll: Use malloc() to allocate the directory cache. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cee9800fc8..c003b08996 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -379,8 +379,7 @@ static void *get_dir_data_space( struct dir_data *data, unsigned int size ) { unsigned int new_size = buffer ? buffer->size * 2 : dir_data_buffer_initial_size; if (new_size < size) new_size = size; - if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, - offsetof( struct dir_data_buffer, data[new_size] ) ))) return NULL; + if (!(buffer = malloc( offsetof( struct dir_data_buffer, data[new_size] ) ))) return NULL; buffer->pos = 0; buffer->size = new_size; buffer->next = data->buffer; @@ -419,9 +418,7 @@ static BOOL add_dir_data_names( struct dir_data *data, const WCHAR *long_name, { unsigned int new_size = max( data->size * 2, dir_data_names_initial_size ); - if (names) names = RtlReAllocateHeap( GetProcessHeap(), 0, names, new_size * sizeof(*names) ); - else names = RtlAllocateHeap( GetProcessHeap(), 0, new_size * sizeof(*names) ); - if (!names) return FALSE; + if (!(names = realloc( names, new_size * sizeof(*names) ))) return FALSE; data->size = new_size; data->names = names; } @@ -448,10 +445,10 @@ static void free_dir_data( struct dir_data *data ) for (buffer = data->buffer; buffer; buffer = next) { next = buffer->next; - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); } - RtlFreeHeap( GetProcessHeap(), 0, data->names ); - RtlFreeHeap( GetProcessHeap(), 0, data ); + free( data->names ); + free( data ); } @@ -468,8 +465,7 @@ static struct list dir_queue = LIST_INIT( dir_queue ); static NTSTATUS add_dir_to_queue( const char *name ) { int len = strlen( name ) + 1; - struct dir_name *dir = RtlAllocateHeap( GetProcessHeap(), 0, - FIELD_OFFSET( struct dir_name, name[len] )); + struct dir_name *dir = malloc( offsetof( struct dir_name, name[len] )); if (!dir) return STATUS_NO_MEMORY; strcpy( dir->name, name ); list_add_tail( &dir_queue, &dir->entry ); @@ -484,7 +480,7 @@ static NTSTATUS next_dir_in_queue( char *name ) struct dir_name *dir = LIST_ENTRY( head, struct dir_name, entry ); strcpy( name, dir->name ); list_remove( &dir->entry ); - RtlFreeHeap( GetProcessHeap(), 0, dir ); + free( dir ); return STATUS_SUCCESS; } return STATUS_OBJECT_NAME_NOT_FOUND; @@ -498,7 +494,7 @@ static void flush_dir_queue(void) { struct dir_name *dir = LIST_ENTRY( head, struct dir_name, entry ); list_remove( &dir->entry ); - RtlFreeHeap( GetProcessHeap(), 0, dir ); + free( dir ); } } @@ -2293,8 +2289,7 @@ static NTSTATUS init_cached_dir_data( struct dir_data **data_ret, int fd, const NTSTATUS status; unsigned int i; - if (!(data = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) - return STATUS_NO_MEMORY; + if (!(data = calloc( 1, sizeof(*data) ))) return STATUS_NO_MEMORY; if ((status = read_directory_data( data, fd, mask ))) { @@ -2310,18 +2305,9 @@ static NTSTATUS init_cached_dir_data( struct dir_data **data_ret, int fd, const if (data->count) { - /* release unused space */ - if (data->buffer) - RtlReAllocateHeap( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, data->buffer, - offsetof( struct dir_data_buffer, data[data->buffer->pos] )); - if (data->count < data->size) - RtlReAllocateHeap( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, data->names, - data->count * sizeof(*data->names) ); - if (!fstat( fd, &st )) - { - data->id.dev = st.st_dev; - data->id.ino = st.st_ino; - } + fstat( fd, &st ); + data->id.dev = st.st_dev; + data->id.ino = st.st_ino; } TRACE( "mask %s found %u files\n", debugstr_us( mask ), data->count ); @@ -2372,14 +2358,10 @@ static NTSTATUS get_cached_dir_data( HANDLE handle, struct dir_data **data_ret, if (entry >= dir_data_cache_size) { unsigned int size = max( dir_data_cache_initial_size, max( dir_data_cache_size * 2, entry + 1 ) ); - struct dir_data **new_cache; + struct dir_data **new_cache = realloc( dir_data_cache, size * sizeof(*new_cache) ); - if (dir_data_cache) - new_cache = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, dir_data_cache, - size * sizeof(*new_cache) ); - else - new_cache = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(*new_cache) ); if (!new_cache) return STATUS_NO_MEMORY; + memset( new_cache + dir_data_cache_size, 0, (size - dir_data_cache_size) * sizeof(*new_cache) ); dir_data_cache = new_cache; dir_data_cache_size = size; }

1 0

Gijs Vermeulen : amstream: Add AMMediaStream::JoinFilterGraph() tests.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 3572a7f44004a9ebd16e2b1e8164b3477f0d5227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3572a7f44004a9ebd16e2b1e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jul 13 19:08:44 2020 +0200 amstream: Add AMMediaStream::JoinFilterGraph() tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2d9f3e35f2..a0876d6242 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4328,6 +4328,89 @@ static void test_ammediastream_join_filter(void) check_ammediastream_join_filter(&CLSID_AMDirectDrawStream); } +static void check_ammediastream_join_filter_graph(const MSPID *id) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IGraphBuilder *builder, *builder2; + IMediaStreamFilter *filter; + IAMMediaStream *stream; + IFilterGraph *graph; + FILTER_INFO info; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, (IMediaStream **)&stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!builder, "Expected non-null graph.\n"); + EXPECT_REF(builder, 4); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + /* Crashes on native. */ + if (0) + { + hr = IAMMediaStream_JoinFilterGraph(stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + hr = IAMMediaStream_JoinFilterGraph(stream, graph); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(builder2 == builder, "Expected graph %p, got %p.\n", builder, builder2); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IGraphBuilder_Release(builder2); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + ref = IFilterGraph_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(builder); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ammediastream_join_filter_graph(void) +{ + check_ammediastream_join_filter_graph(&MSPID_PrimaryAudio); + check_ammediastream_join_filter_graph(&MSPID_PrimaryVideo); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5023,6 +5106,7 @@ START_TEST(amstream) test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); + test_ammediastream_join_filter_graph(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run();

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate temporary filename buffers.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 83f9e784e42c404e31172e55a406a8403c8a33de URL: https://source.winehq.org/git/wine.git/?a=commit;h=83f9e784e42c404e31172e55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:33:23 2020 +0200 ntdll: Use malloc() to allocate temporary filename buffers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c003b08996..bf435f109f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1503,7 +1503,7 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) /* is a symbolic link and a directory, consider these "reparse points" */ if (S_ISDIR( st->st_mode )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT; } - else if (S_ISDIR( st->st_mode ) && (parent_path = RtlAllocateHeap( GetProcessHeap(), 0, strlen(path) + 4 ))) + else if (S_ISDIR( st->st_mode ) && (parent_path = malloc( strlen(path) + 4 ))) { struct stat parent_st; @@ -1514,7 +1514,7 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) && (st->st_dev != parent_st.st_dev || st->st_ino == parent_st.st_ino)) *attr |= FILE_ATTRIBUTE_REPARSE_POINT; - RtlFreeHeap( GetProcessHeap(), 0, parent_path ); + free( parent_path ); } *attr |= get_file_attributes( st ); return ret; @@ -1858,8 +1858,7 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) struct stat st; unsigned int i; - if ((buffer = RtlAllocateHeap( GetProcessHeap(), 0, - strlen(config_dir) + sizeof("/dosdevices/a:") ))) + if ((buffer = malloc( strlen(config_dir) + sizeof("/dosdevices/a:") ))) { strcpy( buffer, config_dir ); strcat( buffer, "/dosdevices/a:" ); @@ -1880,7 +1879,7 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) cache[i].ino = 0; } } - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); } last_update = now; } @@ -1911,7 +1910,7 @@ static int find_dos_device( const char *path ) while (len > 1 && path[len - 1] == '/') len--; /* make a copy of the path */ - if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len + 1 ))) return -1; + if (!(buffer = malloc( len + 1 ))) return -1; memcpy( buffer, path, len ); buffer[len] = 0; @@ -1928,7 +1927,7 @@ static int find_dos_device( const char *path ) if (len == 1) len = 0; /* preserve root slash in returned path */ TRACE( "%s -> drive %c:, root=%s, name=%s\n", debugstr_a(path), 'A' + drive, debugstr_a(buffer), debugstr_a(path + len)); - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); return drive; } } @@ -1938,7 +1937,7 @@ static int find_dos_device( const char *path ) while (path[len - 1] == '/') len--; buffer[len] = 0; } - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); return -1; } @@ -3467,13 +3466,13 @@ static NTSTATUS unmount_device( HANDLE handle ) #else static const char umount[] = "umount >/dev/null 2>&1 "; #endif - char *cmd = RtlAllocateHeap( GetProcessHeap(), 0, strlen(mount_point)+sizeof(umount)); + char *cmd = malloc( strlen(mount_point)+sizeof(umount)); if (cmd) { strcpy( cmd, umount ); strcat( cmd, mount_point ); system( cmd ); - RtlFreeHeap( GetProcessHeap(), 0, cmd ); + free( cmd ); #ifdef linux /* umount will fail to release the loop device since we still have a handle to it, so we release it here */ @@ -3993,7 +3992,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, char *tmpbuf; ULONG size = info->MaximumMessageSize ? info->MaximumMessageSize : 0x10000; if (size > 0x10000) size = 0x10000; - if ((tmpbuf = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + if ((tmpbuf = malloc( size ))) { if (!server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) { @@ -4002,7 +4001,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE; if (needs_close) close( fd ); } - RtlFreeHeap( GetProcessHeap(), 0, tmpbuf ); + free( tmpbuf ); } } }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the logical processor information.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: fe7b8d70d5229c693dc16b743ef0ec7f76a1569f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe7b8d70d5229c693dc16b74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:34:31 2020 +0200 ntdll: Use malloc() to allocate the logical processor information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 99 +++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3557df6108..eedd67fba1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -496,32 +496,24 @@ void init_cpu_info(void) cpu_info.Architecture, cpu_info.Level, cpu_info.Revision, cpu_info.FeatureSet ); } -static BOOL grow_logical_proc_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **pdataex, DWORD *max_len ) +static BOOL grow_logical_proc_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, DWORD *max_len ) { - if (pdata) - { - SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; - - *max_len *= 2; - new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *pdata, *max_len*sizeof(*new_data)); - if (!new_data) - return FALSE; - - *pdata = new_data; - } - else - { - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *new_dataex; - - *max_len *= 2; - new_dataex = RtlReAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, *pdataex, *max_len*sizeof(*new_dataex)); - if (!new_dataex) - return FALSE; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; - *pdataex = new_dataex; - } + *max_len *= 2; + if (!(new_data = realloc( *pdata, *max_len*sizeof(*new_data) ))) return FALSE; + *pdata = new_data; + return TRUE; +} +static BOOL grow_logical_proc_ex_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **pdataex, DWORD *max_len ) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *new_dataex; + DWORD new_len = *max_len * 2; + if (!(new_dataex = realloc( *pdataex, new_len * sizeof(*new_dataex) ))) return FALSE; + memset( new_dataex + *max_len, 0, (new_len - *max_len) * sizeof(*new_dataex) ); + *pdataex = new_dataex; + *max_len = new_len; return TRUE; } @@ -570,7 +562,7 @@ static BOOL logical_proc_info_add_by_id( SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** while (*len == *pmax_len) { - if (!grow_logical_proc_buf(pdata, NULL, pmax_len)) return FALSE; + if (!grow_logical_proc_buf(pdata, pmax_len)) return FALSE; } (*pdata)[i].Relationship = rel; @@ -606,7 +598,7 @@ static BOOL logical_proc_info_add_by_id( SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** while (ofs + log_proc_ex_size_plus(sizeof(PROCESSOR_RELATIONSHIP)) > *pmax_len) { - if (!grow_logical_proc_buf(NULL, pdataex, pmax_len)) return FALSE; + if (!grow_logical_proc_ex_buf(pdataex, pmax_len)) return FALSE; } dataex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)(((char *)*pdataex) + ofs); @@ -647,7 +639,7 @@ static BOOL logical_proc_info_add_cache( SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** } while (*len == *pmax_len) - if (!grow_logical_proc_buf(pdata, NULL, pmax_len)) return FALSE; + if (!grow_logical_proc_buf(pdata, pmax_len)) return FALSE; (*pdata)[i].Relationship = RelationCache; (*pdata)[i].ProcessorMask = mask; @@ -670,7 +662,7 @@ static BOOL logical_proc_info_add_cache( SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** while (ofs + log_proc_ex_size_plus(sizeof(CACHE_RELATIONSHIP)) > *pmax_len) { - if (!grow_logical_proc_buf(NULL, pdataex, pmax_len)) return FALSE; + if (!grow_logical_proc_ex_buf(pdataex, pmax_len)) return FALSE; } dataex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)(((char *)*pdataex) + ofs); @@ -698,7 +690,7 @@ static BOOL logical_proc_info_add_numa_node( SYSTEM_LOGICAL_PROCESSOR_INFORMATIO if (pdata) { while (*len == *pmax_len) - if (!grow_logical_proc_buf(pdata, NULL, pmax_len)) return FALSE; + if (!grow_logical_proc_buf(pdata, pmax_len)) return FALSE; (*pdata)[*len].Relationship = RelationNumaNode; (*pdata)[*len].ProcessorMask = mask; @@ -711,7 +703,7 @@ static BOOL logical_proc_info_add_numa_node( SYSTEM_LOGICAL_PROCESSOR_INFORMATIO while (*len + log_proc_ex_size_plus(sizeof(NUMA_NODE_RELATIONSHIP)) > *pmax_len) { - if (!grow_logical_proc_buf(NULL, pdataex, pmax_len)) return FALSE; + if (!grow_logical_proc_ex_buf(pdataex, pmax_len)) return FALSE; } dataex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)(((char *)*pdataex) + *len); @@ -734,7 +726,7 @@ static BOOL logical_proc_info_add_group( SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex; while (*len + log_proc_ex_size_plus(sizeof(GROUP_RELATIONSHIP)) > *pmax_len) - if (!grow_logical_proc_buf(NULL, pdataex, pmax_len)) return FALSE; + if (!grow_logical_proc_ex_buf(pdataex, pmax_len)) return FALSE; dataex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)(((char *)*pdataex) + *len); @@ -2479,27 +2471,23 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, /* Each logical processor may use up to 7 entries in returned table: * core, numa node, package, L1i, L1d, L2, L3 */ len = 7 * NtCurrentTeb()->Peb->NumberOfProcessors; - buf = RtlAllocateHeap(GetProcessHeap(), 0, len * sizeof(*buf)); + buf = malloc( len * sizeof(*buf) ); if (!buf) { ret = STATUS_NO_MEMORY; break; } - ret = create_logical_proc_info(&buf, NULL, &len, RelationAll); - if( ret != STATUS_SUCCESS ) + if (!ret) { - RtlFreeHeap(GetProcessHeap(), 0, buf); - break; - } - - if (size >= len) - { - if (!info) ret = STATUS_ACCESS_VIOLATION; - else memcpy( info, buf, len); + if (size >= len) + { + if (!info) ret = STATUS_ACCESS_VIOLATION; + else memcpy( info, buf, len); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; } - else ret = STATUS_INFO_LENGTH_MISMATCH; - RtlFreeHeap(GetProcessHeap(), 0, buf); + free( buf ); break; } @@ -2600,29 +2588,22 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, } len = 3 * sizeof(*buf); - buf = RtlAllocateHeap(GetProcessHeap(), 0, len); - if (!buf) + if (!(buf = malloc( len ))) { ret = STATUS_NO_MEMORY; break; } - ret = create_logical_proc_info(NULL, &buf, &len, *(DWORD *)query); - if (ret != STATUS_SUCCESS) - { - RtlFreeHeap(GetProcessHeap(), 0, buf); - break; - } - - if (size >= len) + if (!ret) { - if (!info) ret = STATUS_ACCESS_VIOLATION; - else memcpy(info, buf, len); + if (size >= len) + { + if (!info) ret = STATUS_ACCESS_VIOLATION; + else memcpy(info, buf, len); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; } - else - ret = STATUS_INFO_LENGTH_MISMATCH; - - RtlFreeHeap(GetProcessHeap(), 0, buf); + free( buf ); break; }

1 0