August 2018 - Wine-devel - list.winehq.org

[PATCH 03/11] dxgi: Introduce helper function to destroy partially initialized swapchain.
by Józef Kucia 09 Aug '18

09 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 117 +++++++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 54 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3537f117d1b6..7a305554dbeb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -926,33 +926,47 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain3 *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface) +static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { - struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - ULONG refcount = InterlockedDecrement(&swapchain->refcount); unsigned int i; - TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); - - if (!refcount) - { + if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); + if (swapchain->factory) IWineDXGIFactory_Release(swapchain->factory); - wined3d_private_store_cleanup(&swapchain->private_store); + wined3d_private_store_cleanup(&swapchain->private_store); - for (i = 0; i < swapchain->buffer_count; ++i) - { + for (i = 0; i < swapchain->buffer_count; ++i) + { + if (swapchain->buffers[i]) vkd3d_resource_decref(swapchain->buffers[i]); - } + } + if (swapchain->vk_device) + { vk_funcs->p_vkDestroyFence(swapchain->vk_device, swapchain->vk_fence, NULL); vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); + } + + if (swapchain->vk_instance) vk_funcs->p_vkDestroySurfaceKHR(swapchain->vk_instance, swapchain->vk_surface, NULL); + if (swapchain->device) ID3D12Device_Release(swapchain->device); +} + +static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface) +{ + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + ULONG refcount = InterlockedDecrement(&swapchain->refcount); + TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); + + if (!refcount) + { + d3d12_swapchain_destroy(swapchain); heap_free(swapchain); } @@ -1621,9 +1635,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkSurfaceCapabilitiesKHR surface_caps; VkPhysicalDevice vk_physical_device; VkFence vk_fence = VK_NULL_HANDLE; - unsigned int image_count, i, j; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; + unsigned int image_count, i; VkImageUsageFlags usage; VkInstance vk_instance; VkBool32 supported; @@ -1677,9 +1691,14 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI vk_physical_device = vkd3d_get_vk_physical_device(device); vk_device = vkd3d_get_vk_device(device); + swapchain->vk_instance = vk_instance; + swapchain->vk_device = vk_device; + if (!init_vk_funcs(&swapchain->vk_funcs, vk_device)) return E_FAIL; + wined3d_private_store_init(&swapchain->private_store); + surface_desc.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; surface_desc.pNext = NULL; surface_desc.flags = 0; @@ -1688,28 +1707,32 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateWin32SurfaceKHR(vk_instance, &surface_desc, NULL, &vk_surface)) < 0) { WARN("Failed to create Vulkan surface, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } + swapchain->vk_surface = vk_surface; queue_family_index = vkd3d_get_vk_queue_family_index(queue); if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceSupportKHR(vk_physical_device, queue_family_index, vk_surface, &supported)) < 0 || !supported) { FIXME("Queue family does not support presentation, vr %d.\n", vr); - hr = DXGI_ERROR_UNSUPPORTED; - goto fail; + d3d12_swapchain_destroy(swapchain); + return DXGI_ERROR_UNSUPPORTED; } if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, vk_surface, swapchain_desc, &vk_format))) - goto fail; + { + d3d12_swapchain_destroy(swapchain); + return hr; + } if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, vk_surface, &surface_caps)) < 0) { WARN("Failed to get surface capabilities, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } if (surface_caps.maxImageCount && (swapchain_desc->BufferCount > surface_caps.maxImageCount @@ -1717,8 +1740,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI { WARN("Buffer count %u is not supported (%u-%u).\n", swapchain_desc->BufferCount, surface_caps.minImageCount, surface_caps.maxImageCount); - hr = DXGI_ERROR_UNSUPPORTED; - goto fail; + d3d12_swapchain_destroy(swapchain); + return DXGI_ERROR_UNSUPPORTED; } if (swapchain_desc->Width > surface_caps.maxImageExtent.width @@ -1735,8 +1758,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) { FIXME("Unsupported alpha mode.\n"); - hr = DXGI_ERROR_UNSUPPORTED; - goto fail; + d3d12_swapchain_destroy(swapchain); + return DXGI_ERROR_UNSUPPORTED; } usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; @@ -1767,9 +1790,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) { WARN("Failed to create Vulkan swapchain, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } + swapchain->vk_swapchain = vk_swapchain; fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fence_desc.pNext = NULL; @@ -1777,40 +1801,37 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateFence(vk_device, &fence_desc, NULL, &vk_fence)) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } + swapchain->vk_fence = vk_fence; if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } if (image_count != swapchain_desc->BufferCount) FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); if (image_count > ARRAY_SIZE(vk_images)) { - hr = E_FAIL; - goto fail; + d3d12_swapchain_destroy(swapchain); + return E_FAIL; } + swapchain->buffer_count = image_count; if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } - swapchain->vk_swapchain = vk_swapchain; - swapchain->vk_surface = vk_surface; - swapchain->vk_fence = vk_fence; - swapchain->vk_instance = vk_instance; - swapchain->vk_device = vk_device; - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) { WARN("Failed to acquire Vulkan image, hr %#x.\n", hr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hr; } resource_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; @@ -1839,28 +1860,16 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI else { ERR("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); - for (j = 0; j < i; ++j) - { - vkd3d_resource_decref(swapchain->buffers[j]); - } - goto fail; + d3d12_swapchain_destroy(swapchain); + return hr; } } - swapchain->buffer_count = image_count; - - wined3d_private_store_init(&swapchain->private_store); ID3D12CommandQueue_AddRef(swapchain->command_queue = queue); ID3D12Device_AddRef(swapchain->device = device); IWineDXGIFactory_AddRef(swapchain->factory = factory); return S_OK; - -fail: - vk_funcs->p_vkDestroyFence(vk_device, vk_fence, NULL); - vk_funcs->p_vkDestroySwapchainKHR(vk_device, vk_swapchain, NULL); - vk_funcs->p_vkDestroySurfaceKHR(vk_instance, vk_surface, NULL); - return hr; } HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, -- 2.16.4

2 1

[PATCH 2/2] xaudio2: IXAPO::Reset returns void
by Andrew Eikum 09 Aug '18

09 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xapofx.c | 9 +++------ include/xapo.idl | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index c39b428e29..e450851b25 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -145,11 +145,10 @@ static HRESULT WINAPI VUMXAPO_Initialize(IXAPO *iface, const void *data, return E_NOTIMPL; } -static HRESULT WINAPI VUMXAPO_Reset(IXAPO *iface) +static void WINAPI VUMXAPO_Reset(IXAPO *iface) { VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); TRACE("%p\n", This); - return E_NOTIMPL; } static HRESULT WINAPI VUMXAPO_LockForProcess(IXAPO *iface, @@ -347,11 +346,10 @@ static HRESULT WINAPI RVBXAPO_Initialize(IXAPO *iface, const void *data, return E_NOTIMPL; } -static HRESULT WINAPI RVBXAPO_Reset(IXAPO *iface) +static void WINAPI RVBXAPO_Reset(IXAPO *iface) { ReverbImpl *This = ReverbImpl_from_IXAPO(iface); TRACE("%p\n", This); - return E_NOTIMPL; } static HRESULT WINAPI RVBXAPO_LockForProcess(IXAPO *iface, UINT32 in_params_count, @@ -548,11 +546,10 @@ static HRESULT WINAPI EQXAPO_Initialize(IXAPO *iface, const void *data, return E_NOTIMPL; } -static HRESULT WINAPI EQXAPO_Reset(IXAPO *iface) +static void WINAPI EQXAPO_Reset(IXAPO *iface) { EQImpl *This = EQImpl_from_IXAPO(iface); TRACE("%p\n", This); - return E_NOTIMPL; } static HRESULT WINAPI EQXAPO_LockForProcess(IXAPO *iface, UINT32 in_params_count, diff --git a/include/xapo.idl b/include/xapo.idl index de09ba0c91..9c3ad15134 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -110,7 +110,7 @@ interface IXAPO : IUnknown HRESULT Initialize(const void *data, UINT32 data_len); - HRESULT Reset(void); + void Reset(void); HRESULT LockForProcess(UINT32 in_params_count, const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *in_params, UINT32 out_params_count, const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *out_params); -- 2.18.0

1 0

[PATCH 1/2] xaudio2: Fix XAUDIO2_VOICE_SENDS usage before version 2.4
by Andrew Eikum 09 Aug '18

09 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/compat.c | 199 +++++++++++++++++++++++++++------------- include/xaudio2.idl | 8 +- 2 files changed, 137 insertions(+), 70 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index b9e720f22c..b9f416654d 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -105,6 +105,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #endif +#if XAUDIO2_VER <= 3 +static XAUDIO2_SEND_DESCRIPTOR *convert_send_descriptors23(const XAUDIO23_VOICE_SENDS *sends) +{ + XAUDIO2_SEND_DESCRIPTOR *ret; + DWORD i; + + ret = HeapAlloc(GetProcessHeap(), 0, sends->OutputCount * sizeof(XAUDIO2_SEND_DESCRIPTOR)); + + for(i = 0; i < sends->OutputCount; ++i){ + ret[i].Flags = 0; + ret[i].pOutputVoice = sends->pOutputVoices[i]; + } + + return ret; +} +#endif + /* BEGIN IXAudio2SourceVoice */ #if XAUDIO2_VER == 0 static XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) @@ -129,22 +146,21 @@ static HRESULT WINAPI XA20SRC_SetOutputVoices(IXAudio20SourceVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, &sends); + hr = IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -387,22 +403,21 @@ static HRESULT WINAPI XA23SRC_SetOutputVoices(IXAudio23SourceVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, &sends); + hr = IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -908,22 +923,21 @@ static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, &sends); + hr = IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -1094,22 +1108,21 @@ static HRESULT WINAPI XA23SUB_SetOutputVoices(IXAudio23SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, &sends); + hr = IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -1470,22 +1483,21 @@ static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, &sends); + hr = IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -1656,22 +1668,21 @@ static HRESULT WINAPI XA23M_SetOutputVoices(IXAudio23MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, &sends); + hr = IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -2151,25 +2162,53 @@ static void WINAPI XA20_UnregisterForCallbacks(IXAudio20 *iface, static HRESULT WINAPI XA20_CreateSourceVoice(IXAudio20 *iface, IXAudio2SourceVoice **ppSourceVoice, const WAVEFORMATEX *pSourceFormat, UINT32 flags, float maxFrequencyRatio, - IXAudio2VoiceCallback *pCallback, const XAUDIO2_VOICE_SENDS *pSendList, + IXAudio2VoiceCallback *pCallback, const XAUDIO23_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - return IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, - pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, + XAUDIO2_VOICE_SENDS sends, *psends = NULL; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, + pSourceFormat, flags, maxFrequencyRatio, pCallback, psends, pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; } static HRESULT WINAPI XA20_CreateSubmixVoice(IXAudio20 *iface, IXAudio2SubmixVoice **ppSubmixVoice, UINT32 inputChannels, UINT32 inputSampleRate, UINT32 flags, UINT32 processingStage, - const XAUDIO2_VOICE_SENDS *pSendList, + const XAUDIO23_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - return IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, - inputChannels, inputSampleRate, flags, processingStage, pSendList, + XAUDIO2_VOICE_SENDS sends, *psends; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, + inputChannels, inputSampleRate, flags, processingStage, psends, pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; } static HRESULT WINAPI XA20_CreateMasteringVoice(IXAudio20 *iface, @@ -2406,25 +2445,53 @@ static void WINAPI XA22_UnregisterForCallbacks(IXAudio22 *iface, static HRESULT WINAPI XA22_CreateSourceVoice(IXAudio22 *iface, IXAudio2SourceVoice **ppSourceVoice, const WAVEFORMATEX *pSourceFormat, UINT32 flags, float maxFrequencyRatio, - IXAudio2VoiceCallback *pCallback, const XAUDIO2_VOICE_SENDS *pSendList, + IXAudio2VoiceCallback *pCallback, const XAUDIO23_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - return IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, - pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, + XAUDIO2_VOICE_SENDS sends, *psends = NULL; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, + pSourceFormat, flags, maxFrequencyRatio, pCallback, psends, pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; } static HRESULT WINAPI XA22_CreateSubmixVoice(IXAudio22 *iface, IXAudio2SubmixVoice **ppSubmixVoice, UINT32 inputChannels, UINT32 inputSampleRate, UINT32 flags, UINT32 processingStage, - const XAUDIO2_VOICE_SENDS *pSendList, + const XAUDIO23_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - return IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, - inputChannels, inputSampleRate, flags, processingStage, pSendList, + XAUDIO2_VOICE_SENDS sends, *psends; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, + inputChannels, inputSampleRate, flags, processingStage, psends, pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; } static HRESULT WINAPI XA22_CreateMasteringVoice(IXAudio22 *iface, diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 9bf33ee17e..e97cf9948b 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -956,7 +956,7 @@ interface IXAudio20 : IUnknown [in, defaultvalue(0)] UINT32 Flags, [in, defaultvalue(XAUDIO2_DEFAULT_FREQ_RATIO)] float MaxFrequencyRatio, [in, defaultvalue(NULL)] IXAudio2VoiceCallback* pCallback, - [in, defaultvalue(NULL)] const XAUDIO2_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); HRESULT CreateSubmixVoice( @@ -965,7 +965,7 @@ interface IXAudio20 : IUnknown [in] UINT32 InputSampleRate, [in, defaultvalue(0)] UINT32 Flags, [in, defaultvalue(0)] UINT32 ProcessingStage, - [in, defaultvalue(NULL)] const XAUDIO2_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); HRESULT CreateMasteringVoice( @@ -1017,7 +1017,7 @@ interface IXAudio22 : IUnknown [in, defaultvalue(0)] UINT32 Flags, [in, defaultvalue(XAUDIO2_DEFAULT_FREQ_RATIO)] float MaxFrequencyRatio, [in, defaultvalue(NULL)] IXAudio2VoiceCallback* pCallback, - [in, defaultvalue(NULL)] const XAUDIO2_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); HRESULT CreateSubmixVoice( @@ -1026,7 +1026,7 @@ interface IXAudio22 : IUnknown [in] UINT32 InputSampleRate, [in, defaultvalue(0)] UINT32 Flags, [in, defaultvalue(0)] UINT32 ProcessingStage, - [in, defaultvalue(NULL)] const XAUDIO2_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); HRESULT CreateMasteringVoice( -- 2.18.0

1 0

[PATCH] wnaspi32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Aug '18

09 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wnaspi32/aspi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index e03b767979..df052ff2fc 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -130,7 +130,7 @@ int ASPI_GetNumControllers(void) ERR("Could not open HKLM\\%s\n", debugstr_w(wDevicemapScsi)); return 0; } - while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)/sizeof(wPortName[0])) == ERROR_SUCCESS) + while (RegEnumKeyW(hkeyScsi, i++, wPortName, ARRAY_SIZE(wPortName)) == ERROR_SUCCESS) { if (RegOpenKeyExW(hkeyScsi, wPortName, 0, KEY_QUERY_VALUE, &hkeyPort) == ERROR_SUCCESS) { @@ -192,7 +192,7 @@ DWORD ASPI_GetHCforController( int controller ) ERR("Could not open HKLM\\%s\n", debugstr_w(wDevicemapScsi)); return 0xFFFFFFFF; } - while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)/sizeof(wPortName[0])) == ERROR_SUCCESS) + while (RegEnumKeyW(hkeyScsi, i++, wPortName, ARRAY_SIZE(wPortName)) == ERROR_SUCCESS) { if (RegOpenKeyExW(hkeyScsi, wPortName, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hkeyPort) == ERROR_SUCCESS) @@ -215,7 +215,7 @@ DWORD ASPI_GetHCforController( int controller ) return 0xFFFFFFFF; } - if (RegEnumKeyW(hkeyPort, -num_ha, wBusName, sizeof(wBusName)/sizeof(wBusName[0])) != ERROR_SUCCESS) + if (RegEnumKeyW(hkeyPort, -num_ha, wBusName, ARRAY_SIZE(wBusName)) != ERROR_SUCCESS) { ERR("Failed to enumerate keys\n"); RegCloseKey(hkeyPort); -- 2.14.4

1 0

[PATCH] wldap32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Aug '18

09 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index 2e09e9e399..fbbd124d23 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -303,7 +303,7 @@ ULONG CDECL LdapMapErrorToWin32( ULONG err ) { TRACE( "(0x%08x)\n", err ); - if (err >= sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0])) + if (err >= ARRAY_SIZE( WLDAP32_errormap )) return ERROR_DS_GENERIC_ERROR; return WLDAP32_errormap[err]; } -- 2.14.4

1 0

[PATCH] wlanapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Aug '18

09 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wlanapi/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index b764681006..f0a0091d4d 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -49,7 +49,7 @@ static struct wine_wlan* handle_index(HANDLE handle) { ULONG_PTR i = (ULONG_PTR)handle - 1; - if (i < sizeof(handle_table) / sizeof(handle_table[0]) && handle_table[i].magic == WLAN_MAGIC) + if (i < ARRAY_SIZE(handle_table) && handle_table[i].magic == WLAN_MAGIC) return &handle_table[i]; return NULL; @@ -59,7 +59,7 @@ static HANDLE handle_new(struct wine_wlan **entry) { ULONG_PTR i; - for (i = 0; i < sizeof(handle_table) / sizeof(handle_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(handle_table); i++) { if (handle_table[i].magic == 0) { -- 2.14.4

1 0

[PATCH] version: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Aug '18

09 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/version/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index f33361bebb..5299ecd32f 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1313,7 +1313,7 @@ DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, /* Figure out where the file should go; shared files default to the system directory */ - GetSystemDirectoryW(systemDir, sizeof(systemDir)/sizeof(WCHAR)); + GetSystemDirectoryW(systemDir, ARRAY_SIZE(systemDir)); curDir = &emptyW; if(flags & VFFF_ISSHAREDFILE) -- 2.14.4

1 0

[PATCH] amstream: Handle stream object parameter for IDirectDrawMediaStream.
by Józef Kucia 09 Aug '18

09 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45382 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/amstream/amstream.c | 7 ++----- dlls/amstream/amstream_private.h | 4 ++-- dlls/amstream/mediastream.c | 19 +++++++++++++------ dlls/amstream/tests/amstream.c | 7 ++++--- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 463cba690b39..3b2f71add5ba 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -339,9 +339,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; - if (stream_object) - FIXME("Specifying a stream object in params is not yet supported\n"); - if (dwFlags & AMMSF_ADDDEFAULTRENDERER) { if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) @@ -367,9 +364,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream } if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) - hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->StreamType, &pStream); else - hr = audiomediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + hr = audiomediastream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->StreamType, &pStream); if (SUCCEEDED(hr)) { pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IAMMediaStream*)); diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index 64a376f0588c..8f25b8e248e6 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -37,8 +37,8 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, - STREAM_TYPE StreamType, IAMMediaStream **ppMediaStream) DECLSPEC_HIDDEN; + IUnknown *stream_object, STREAM_TYPE StreamType, IAMMediaStream **ppMediaStream) DECLSPEC_HIDDEN; HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IAMMediaStream **media_stream) DECLSPEC_HIDDEN; + IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 4971bf166c6d..bc6159750228 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -599,15 +599,15 @@ static const BaseInputPinFuncTable DirectDrawMediaStreamInputPin_FuncTable = }; HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IAMMediaStream **media_stream) + IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { DirectDrawMediaStreamImpl *object; PIN_INFO pin_info; HRESULT hr; - TRACE("(%p,%s,%p)\n", parent, debugstr_guid(purpose_id), media_stream); + TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DirectDrawMediaStreamImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -633,6 +633,10 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->purpose_id = *purpose_id; object->stream_type = stream_type; + if (stream_object + && FAILED(hr = IUnknown_QueryInterface(stream_object, &IID_IDirectDraw7, (void **)&object->ddraw))) + FIXME("Stream object doesn't implement IDirectDraw7 interface, hr %#x.\n", hr); + *media_stream = &object->IAMMediaStream_iface; return S_OK; @@ -1139,15 +1143,18 @@ static const BaseInputPinFuncTable AudioMediaStreamInputPin_FuncTable = }; HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IAMMediaStream **media_stream) + IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { AudioMediaStreamImpl *object; PIN_INFO pin_info; HRESULT hr; - TRACE("(%p,%s,%p)\n", parent, debugstr_guid(purpose_id), media_stream); + TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioMediaStreamImpl)); + if (stream_object) + FIXME("Specifying a stream object is not yet supported.\n"); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1a14572c8a2d..97111d6b85f3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -551,8 +551,9 @@ static void test_IDirectDrawStreamSample(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(ddraw == ddraw2, "got %p, %p\n", ddraw, ddraw2); - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void**)&ddraw7); + hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void **)&ddraw7); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ddraw7 == pdd7, "Got IDirectDraw instance %p, expected %p.\n", ddraw7, pdd7); IDirectDraw7_Release(ddraw7); IDirectDraw_Release(ddraw2); @@ -566,7 +567,7 @@ static void test_IDirectDrawStreamSample(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(surface != NULL, "got %p\n", surface); - hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void**)&surface7); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); ok(hr == S_OK, "got 0x%08x\n", hr); IDirectDrawSurface7_Release(surface7); @@ -579,7 +580,7 @@ static void test_IDirectDrawStreamSample(void) IDirectDrawSurface_Release(surface); IDirectDrawStreamSample_Release(pddsample); - hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void**)&surface); + hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void **)&surface); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(surface, 1); -- 2.16.4

1 0

[PATCH] regedit: Dont expand items on initial tree creation.
by Alistair Leslie-Hughes 09 Aug '18

09 Aug '18

The Message TVM_EXPAND is captured in treeview_notify, then passes g_pChildWnd->hTreeWnd on to OnTreeExpanding which hasn't been initialized yet. The function get_last_key is already called after the hTreeWnd has been assigned to select the previous selected item (if it exists). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/regedit/treeview.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index d5a6767..15a5136 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -572,9 +572,6 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) if (!AddEntryToTree(hwndTV, hRoot, hkcc, HKEY_CURRENT_CONFIG, 1)) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE; - /* expand and select host name */ - SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; } -- 1.9.1

1 0

[PATCH] vcomp: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vcomp/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index ab51ef2bcc..3a9fd22aae 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -523,7 +523,7 @@ void CDECL _vcomp_reduction_i1(unsigned int flags, char *dest, char val) _vcomp_atomic_bool_or_i1, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -617,7 +617,7 @@ void CDECL _vcomp_reduction_i2(unsigned int flags, short *dest, short val) _vcomp_atomic_bool_or_i2, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -711,7 +711,7 @@ void CDECL _vcomp_reduction_i4(unsigned int flags, int *dest, int val) _vcomp_atomic_bool_or_i4, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -807,7 +807,7 @@ void CDECL _vcomp_reduction_i8(unsigned int flags, LONG64 *dest, LONG64 val) _vcomp_atomic_bool_or_i8, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -891,7 +891,7 @@ void CDECL _vcomp_reduction_r4(unsigned int flags, float *dest, float val) _vcomp_atomic_bool_or_r4, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -975,7 +975,7 @@ void CDECL _vcomp_reduction_r8(unsigned int flags, double *dest, double val) _vcomp_atomic_bool_or_r8, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } -- 2.14.4

1 0