January 2018 - Wine-Commits

Józef Kucia : libs/vkd3d: Validate signal_event_pfn.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: vkd3d Branch: master Commit: ebca1d33960d037d2839fd9f9d377f94b5b434cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ebca1d33960d037d2839fd9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 17:17:23 2018 +0100 libs/vkd3d: Validate signal_event_pfn. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 5 +++++ tests/vkd3d_api.c | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index af3f053..7a99511 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -221,6 +221,11 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, VkResult vr; HRESULT hr; + if (!create_info->signal_event_pfn) + { + ERR("Invalid signal event function pointer.\n"); + return E_INVALIDARG; + } if (!create_info->create_thread_pfn != !create_info->join_thread_pfn) { ERR("Invalid create/join thread function pointers.\n"); diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 41b09fb..c387abe 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -74,9 +74,7 @@ static void test_create_instance(void) ULONG refcount; HRESULT hr; - memset(&create_info, 0, sizeof(create_info)); - create_info.wchar_size = sizeof(WCHAR); - + create_info = instance_default_create_info; hr = vkd3d_create_instance(&create_info, &instance); ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); refcount = vkd3d_instance_incref(instance); @@ -85,11 +83,15 @@ static void test_create_instance(void) refcount = vkd3d_instance_decref(instance); ok(!refcount, "Instance has %u references left.\n", refcount); - create_info.signal_event_pfn = signal_event; + create_info = instance_default_create_info; + create_info.wchar_size = 1; hr = vkd3d_create_instance(&create_info, &instance); - ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); - refcount = vkd3d_instance_decref(instance); - ok(!refcount, "Instance has %u references left.\n", refcount); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + create_info = instance_default_create_info; + create_info.signal_event_pfn = NULL; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); } static void test_create_device(void)

1 0

Józef Kucia : libs/vkd3d: Simplify vkd3d_restrict_format_support_for_feature_level().
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: vkd3d Branch: master Commit: c64181345b06dc3d4060ba27a4768f1d046ea7fb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c64181345b06dc3d4060ba2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 17:17:21 2018 +0100 libs/vkd3d: Simplify vkd3d_restrict_format_support_for_feature_level(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b93c169..c6971e3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1292,8 +1292,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if } /* Direct3D feature levels restrict which formats can be optionally supported. */ -static void vkd3d_restrict_format_support_for_feature_level( - D3D12_FEATURE_DATA_FORMAT_SUPPORT *format_support, const struct vkd3d_format *format) +static void vkd3d_restrict_format_support_for_feature_level(D3D12_FEATURE_DATA_FORMAT_SUPPORT *format_support) { static const D3D12_FEATURE_DATA_FORMAT_SUPPORT blacklisted_format_features[] = { @@ -1306,7 +1305,7 @@ static void vkd3d_restrict_format_support_for_feature_level( for (i = 0; i < ARRAY_SIZE(blacklisted_format_features); ++i) { - if (blacklisted_format_features[i].Format == format->dxgi_format) + if (blacklisted_format_features[i].Format == format_support->Format) { format_support->Support1 &= ~blacklisted_format_features[i].Support1; format_support->Support2 &= ~blacklisted_format_features[i].Support2; @@ -1463,7 +1462,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX; - vkd3d_restrict_format_support_for_feature_level(data, format); + vkd3d_restrict_format_support_for_feature_level(data); return S_OK; }

1 0

Józef Kucia : tests: Add test for creating instance with vkGetInstanceProcAddr() pointer.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: vkd3d Branch: master Commit: 0fe7efdd739a3cf43b5dc885169f948de6769092 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0fe7efdd739a3cf43b5dc88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 17:17:24 2018 +0100 tests: Add test for creating instance with vkGetInstanceProcAddr() pointer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/.gitignore | 1 + tests/vkd3d_api.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/tests/.gitignore b/tests/.gitignore index 2ea34ba..87d1ea6 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1 +1,2 @@ d3d12 +vkd3d_api diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index c387abe..8923d8e 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -92,6 +92,13 @@ static void test_create_instance(void) create_info.signal_event_pfn = NULL; hr = vkd3d_create_instance(&create_info, &instance); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + create_info = instance_default_create_info; + create_info.vkGetInstanceProcAddr_pfn = vkGetInstanceProcAddr; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); } static void test_create_device(void)

1 0

Józef Kucia : libs/vkd3d: Rename vkd3d_get_vk_instance() to vkd3d_instance_get_vk_instance().
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: vkd3d Branch: master Commit: 6a32ad891385f6131bf977ef7165f104b5d1d262 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6a32ad891385f6131bf977e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 17:17:22 2018 +0100 libs/vkd3d: Rename vkd3d_get_vk_instance() to vkd3d_instance_get_vk_instance(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- demos/demo_xcb.h | 2 +- include/vkd3d.h | 2 +- libs/vkd3d/device.c | 2 +- libs/vkd3d/vkd3d.map | 2 +- tests/vkd3d_api.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index ca0887c..4de1149 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -344,7 +344,7 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c if (FAILED(ID3D12CommandQueue_GetDevice(command_queue, &IID_ID3D12Device, (void **)&d3d12_device))) return NULL; - vk_instance = vkd3d_get_vk_instance(vkd3d_instance_from_device(d3d12_device)); + vk_instance = vkd3d_instance_get_vk_instance(vkd3d_instance_from_device(d3d12_device)); vk_physical_device = vkd3d_get_vk_physical_device(d3d12_device); vk_device = vkd3d_get_vk_device(d3d12_device); diff --git a/include/vkd3d.h b/include/vkd3d.h index 8886499..ac37c26 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -70,8 +70,8 @@ struct vkd3d_device_create_info HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance); -VkInstance vkd3d_get_vk_instance(struct vkd3d_instance *instance); ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); +VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance); ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c6971e3..af3f053 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -344,7 +344,7 @@ ULONG vkd3d_instance_decref(struct vkd3d_instance *instance) return refcount; } -VkInstance vkd3d_get_vk_instance(struct vkd3d_instance *instance) +VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance) { return instance->vk_instance; } diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index c5157c6..9edc3aa 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -8,11 +8,11 @@ global: vkd3d_create_root_signature_deserializer; vkd3d_get_vk_device; vkd3d_get_vk_format; - vkd3d_get_vk_instance; vkd3d_get_vk_physical_device; vkd3d_get_vk_queue_family_index; vkd3d_instance_decref; vkd3d_instance_from_device; + vkd3d_instance_get_vk_instance; vkd3d_instance_incref; vkd3d_release_vk_queue; vkd3d_serialize_root_signature; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index bda0c4e..41b09fb 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -154,7 +154,7 @@ static void test_physical_device(void) hr = vkd3d_create_instance(&instance_default_create_info, &instance); ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); - vk_instance = vkd3d_get_vk_instance(instance); + vk_instance = vkd3d_instance_get_vk_instance(instance); ok(vk_instance != VK_NULL_HANDLE, "Failed to get Vulkan instance.\n"); create_info = device_default_create_info;

1 0

Andrew Eikum : xinput: XInputGetStateEx takes the same struct as XInputGetState.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: de3591ca9803add117fbacb8abe9b335e2e44977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de3591ca9803add117fbacb8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 22 10:03:18 2018 -0600 xinput: XInputGetStateEx takes the same struct as XInputGetState. XINPUT_STATE_EX has four extra bytes for padding, but is otherwise identical to XINPUT_STATE. It was introduced in a libSDL header in 2012, for use with the undocumented function at xinput ordinal 100, which we call XInputGetStateEx. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 34 +++++++++++++++------------------- dlls/xinput1_3/xinput_main.c | 14 ++++---------- include/xinput.h | 18 +----------------- 3 files changed, 20 insertions(+), 46 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 87f9929..f26fda9 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -24,7 +24,7 @@ #include "wine/test.h" static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); -static DWORD (WINAPI *pXInputGetStateEx)(DWORD, XINPUT_STATE_EX*); +static DWORD (WINAPI *pXInputGetStateEx)(DWORD, XINPUT_STATE*); static DWORD (WINAPI *pXInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*); static DWORD (WINAPI *pXInputSetState)(DWORD, XINPUT_VIBRATION*); static void (WINAPI *pXInputEnable)(BOOL); @@ -91,23 +91,19 @@ static void test_set_state(void) static void test_get_state(void) { - union - { - XINPUT_STATE state; - XINPUT_STATE_EX state_ex; - } xinput; + XINPUT_STATE state; DWORD controllerNum, i, result, good = XUSER_MAX_COUNT; for (i = 0; i < (pXInputGetStateEx ? 2 : 1); i++) { for (controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { - ZeroMemory(&xinput, sizeof(xinput)); + ZeroMemory(&state, sizeof(state)); if (i == 0) - result = pXInputGetState(controllerNum, &xinput.state); + result = pXInputGetState(controllerNum, &state); else - result = pXInputGetStateEx(controllerNum, &xinput.state_ex); + result = pXInputGetStateEx(controllerNum, &state); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "%s failed with (%d)\n", i == 0 ? "XInputGetState" : "XInputGetStateEx", result); @@ -125,39 +121,39 @@ static void test_get_state(void) } else trace("XInputGetStateEx: %d\n", result); - trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); - dump_gamepad(&xinput.state.Gamepad); + trace("State->dwPacketNumber: %d\n", state.dwPacketNumber); + dump_gamepad(&state.Gamepad); } } - result = pXInputGetState(XUSER_MAX_COUNT, &xinput.state); + result = pXInputGetState(XUSER_MAX_COUNT, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); - result = pXInputGetState(XUSER_MAX_COUNT+1, &xinput.state); + result = pXInputGetState(XUSER_MAX_COUNT+1, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); if (pXInputGetStateEx) { - result = pXInputGetStateEx(XUSER_MAX_COUNT, &xinput.state_ex); + result = pXInputGetStateEx(XUSER_MAX_COUNT, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); - result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &xinput.state_ex); + result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); } if (winetest_interactive && good < XUSER_MAX_COUNT) { DWORD now = GetTickCount(), packet = 0; - XINPUT_GAMEPAD *game = &xinput.state.Gamepad; + XINPUT_GAMEPAD *game = &state.Gamepad; trace("You have 20 seconds to test the joystick freely\n"); do { Sleep(100); - pXInputGetState(good, &xinput.state); - if (xinput.state.dwPacketNumber == packet) + pXInputGetState(good, &state); + if (state.dwPacketNumber == packet) continue; - packet = xinput.state.dwPacketNumber; + packet = state.dwPacketNumber; trace("Buttons 0x%04X Triggers %3d/%3d LT %6d/%6d RT %6d/%6d\n", game->wButtons, game->bLeftTrigger, game->bRightTrigger, game->sThumbLX, game->sThumbLY, game->sThumbRX, game->sThumbRY); diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 402bd2f..a0a0877 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -73,34 +73,28 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { - union - { - XINPUT_STATE state; - XINPUT_STATE_EX state_ex; - } xinput; DWORD ret; static int warn_once; if (!warn_once++) FIXME("(index %u, state %p) Stub!\n", index, state); - ret = XInputGetStateEx(index, &xinput.state_ex); + ret = XInputGetStateEx(index, state); if (ret != ERROR_SUCCESS) return ret; /* The main difference between this and the Ex version is the media guide button */ - xinput.state.Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE; - *state = xinput.state; + state->Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE; return ERROR_SUCCESS; } -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE_EX* state_ex) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state) { static int warn_once; if (!warn_once++) - FIXME("(index %u, state %p) Stub!\n", index, state_ex); + FIXME("(index %u, state %p) Stub!\n", index, state); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; diff --git a/include/xinput.h b/include/xinput.h index ccdc023..99ff0cc 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -170,27 +170,11 @@ typedef struct _XINPUT_GAMEPAD { SHORT sThumbRY; } XINPUT_GAMEPAD, *PXINPUT_GAMEPAD; -typedef struct _XINPUT_GAMEPAD_EX { - WORD wButtons; - BYTE bLeftTrigger; - BYTE bRightTrigger; - SHORT sThumbLX; - SHORT sThumbLY; - SHORT sThumbRX; - SHORT sThumbRY; - DWORD dwPaddingReserved; -} XINPUT_GAMEPAD_EX, *PXINPUT_GAMEPAD_EX; - typedef struct _XINPUT_STATE { DWORD dwPacketNumber; XINPUT_GAMEPAD Gamepad; } XINPUT_STATE, *PXINPUT_STATE; -typedef struct _XINPUT_STATE_EX { - DWORD dwPacketNumber; - XINPUT_GAMEPAD_EX Gamepad; -} XINPUT_STATE_EX, *PXINPUT_STATE_EX; - /* * Defines the structure of how much vibration is set on both the * right and left motors in a joystick. If you're not using a 360 @@ -248,7 +232,7 @@ DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*); DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*); DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); -DWORD WINAPI XInputGetStateEx(DWORD, XINPUT_STATE_EX*); +DWORD WINAPI XInputGetStateEx(DWORD, XINPUT_STATE*); #ifdef __cplusplus }

1 0

Masanori Kakura : xaudio2: Partially implement XA2SRC_SetChannelVolumes().
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 7ff08817758e48bd42911e56ec72c67a2bc12c5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ff08817758e48bd42911e56… Author: Masanori Kakura <kakurasan(a)gmail.com> Date: Sat Jan 20 13:38:43 2018 +0900 xaudio2: Partially implement XA2SRC_SetChannelVolumes(). Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 28 ++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index ff402f8..ccc415a 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1165,6 +1165,76 @@ static void test_xapo_creation(void) test_xapo_creation_modern("xaudio2_8.dll"); } +static void test_setchannelvolumes(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + IXAudio2SourceVoice *src_2ch, *src_8ch; + WAVEFORMATEX fmt_2ch, fmt_8ch; + float volumes[] = {0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f}; + + if(xaudio27) + hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 8, 44100, 0, 0, NULL); + else + hr = IXAudio2_CreateMasteringVoice(xa, &master, 8, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + + fmt_2ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt_2ch.nChannels = 2; + fmt_2ch.nSamplesPerSec = 44100; + fmt_2ch.wBitsPerSample = 32; + fmt_2ch.nBlockAlign = fmt_2ch.nChannels * fmt_2ch.wBitsPerSample / 8; + fmt_2ch.nAvgBytesPerSec = fmt_2ch.nSamplesPerSec * fmt_2ch.nBlockAlign; + fmt_2ch.cbSize = 0; + + fmt_8ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt_8ch.nChannels = 8; + fmt_8ch.nSamplesPerSec = 44100; + fmt_8ch.wBitsPerSample = 32; + fmt_8ch.nBlockAlign = fmt_8ch.nChannels * fmt_8ch.wBitsPerSample / 8; + fmt_8ch.nAvgBytesPerSec = fmt_8ch.nSamplesPerSec * fmt_8ch.nBlockAlign; + fmt_8ch.cbSize = 0; + + XA2CALL(CreateSourceVoice, &src_2ch, &fmt_2ch, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + XA2CALL(CreateSourceVoice, &src_8ch, &fmt_8ch, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 8, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + + if(xaudio27){ + /* XAudio 2.7 doesn't check the number of channels */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + }else{ + /* the number of channels must be the same as the number of channels on the source voice */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 8, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + + /* volumes must not be NULL, XAudio 2.7 doesn't check this */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, NULL, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + } + + if(xaudio27){ + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_2ch); + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_8ch); + }else{ + IXAudio2SourceVoice_DestroyVoice(src_2ch); + IXAudio2SourceVoice_DestroyVoice(src_8ch); + } + + IXAudio2MasteringVoice_DestroyVoice(master); +} + static UINT32 check_has_devices(IXAudio2 *xa) { HRESULT hr; @@ -1213,6 +1283,7 @@ START_TEST(xaudio2) test_looping((IXAudio2*)xa27); test_submix((IXAudio2*)xa27); test_flush((IXAudio2*)xa27); + test_setchannelvolumes((IXAudio2*)xa27); }else skip("No audio devices available\n"); @@ -1237,6 +1308,7 @@ START_TEST(xaudio2) test_looping(xa); test_submix(xa); test_flush(xa); + test_setchannelvolumes(xa); }else skip("No audio devices available\n"); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index bc5cf1c..9b7a07f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -337,7 +337,35 @@ static HRESULT WINAPI XA2SRC_SetChannelVolumes(IXAudio2SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALfloat al_gain; + UINT32 i; + BOOL same_volumes_given = TRUE; + TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); + +#if XAUDIO2_VER > 7 + if(Channels != This->fmt->nChannels || !pVolumes) + return COMPAT_E_INVALID_CALL; +#endif + + al_gain = *pVolumes; + + /* check whether all volumes are the same */ + for(i = 1; i < Channels; ++i){ + if(al_gain != *(pVolumes + i)){ + same_volumes_given = FALSE; + break; + } + } + if(!same_volumes_given){ + WARN("Different volumes for channels unsupported, setting the highest volume.\n"); + for(; i < Channels; ++i) + al_gain = max(al_gain, *(pVolumes + i)); + } + + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_GAIN, al_gain); + return S_OK; }

1 0

Jacek Caban : schtasks: Added support for /f argument in create command.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: a6a5bca50942fe3b8a432ea99673bad00ef5013f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a5bca50942fe3b8a432ea9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 22 17:35:55 2018 +0100 schtasks: Added support for /f argument in create command. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 7 ++++++- programs/schtasks/tests/schtasks.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 5967e4a..c6b8586 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -183,6 +183,7 @@ static int create_command(int argc, WCHAR *argv[]) { const WCHAR *task_name = NULL, *xml_file = NULL; ITaskFolder *root = NULL; + LONG flags = TASK_CREATE; IRegisteredTask *task; VARIANT empty; BSTR str, xml; @@ -217,6 +218,10 @@ static int create_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; + }else if(!strcmpiW(argv[0], f_optW)) { + flags = TASK_CREATE_OR_UPDATE; + argc--; + argv++; }else { FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); return 1; @@ -245,7 +250,7 @@ static int create_command(int argc, WCHAR *argv[]) V_VT(&empty) = VT_EMPTY; str = SysAllocString(task_name); - hres = ITaskFolder_RegisterTask(root, str, xml, TASK_CREATE, empty, empty, + hres = ITaskFolder_RegisterTask(root, str, xml, flags, empty, empty, TASK_LOGON_NONE, empty, &task); SysFreeString(str); SysFreeString(xml); diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 9f1b920..8f7176a 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -211,6 +211,9 @@ START_TEST(schtasks) r = run_command("schtasks /change /tn wine\\winetest /enable"); ok(r == 0, "r = %u\n", r); + r = run_command("schtasks /create /xml test.xml /f /tn wine\\winetest"); + ok(r == 0, "r = %u\n", r); /* task already exists, but /f argument provided */ + r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); ok(r == 1, "r = %u\n", r); /* task already exists */

1 0

Alexandre Julliard : wineandroid: Don' t allocate a window surface for off-screen windows.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: a6f85e616d127b4d0b9ca7ae5e5631177f355ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f85e616d127b4d0b9ca7ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 12:45:46 2018 +0100 wineandroid: Don't allocate a window surface for off-screen windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 568f5ab..22e2181 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1028,17 +1028,15 @@ static struct android_win_data *create_win_data( HWND hwnd, const RECT *window_r } -static inline RECT get_surface_rect( const RECT *visible_rect ) +static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect ) { - RECT rect; - - IntersectRect( &rect, visible_rect, &virtual_screen_rect ); - OffsetRect( &rect, -visible_rect->left, -visible_rect->top ); - rect.left &= ~31; - rect.top &= ~31; - rect.right = max( rect.left + 32, (rect.right + 31) & ~31 ); - rect.bottom = max( rect.top + 32, (rect.bottom + 31) & ~31 ); - return rect; + if (!IntersectRect( surface_rect, visible_rect, &virtual_screen_rect )) return FALSE; + OffsetRect( surface_rect, -visible_rect->left, -visible_rect->top ); + surface_rect->left &= ~31; + surface_rect->top &= ~31; + surface_rect->right = max( surface_rect->left + 32, (surface_rect->right + 31) & ~31 ); + surface_rect->bottom = max( surface_rect->top + 32, (surface_rect->bottom + 31) & ~31 ); + return TRUE; } @@ -1069,8 +1067,8 @@ void CDECL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_fla if (data->parent) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; if (is_argb_surface( data->surface )) goto done; + if (!get_surface_rect( visible_rect, &surface_rect )) goto done; - surface_rect = get_surface_rect( visible_rect ); if (data->surface) { if (!memcmp( &data->surface->rect, &surface_rect, sizeof(surface_rect) ))

1 0

Alexandre Julliard : winex11: Don' t allocate a window surface for off-screen windows.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 5ef349e45f38ae4d204f151256ad02db6937acab URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ef349e45f38ae4d204f1512… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 12:45:35 2018 +0100 winex11: Don't allocate a window surface for off-screen windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d35328c..a7651fb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2151,17 +2151,17 @@ done: } -static inline RECT get_surface_rect( const RECT *visible_rect ) +static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect ) { - RECT rect = get_virtual_screen_rect(); + *surface_rect = get_virtual_screen_rect(); - IntersectRect( &rect, &rect, visible_rect ); - OffsetRect( &rect, -visible_rect->left, -visible_rect->top ); - rect.left &= ~31; - rect.top &= ~31; - rect.right = max( rect.left + 32, (rect.right + 31) & ~31 ); - rect.bottom = max( rect.top + 32, (rect.bottom + 31) & ~31 ); - return rect; + if (!IntersectRect( surface_rect, surface_rect, visible_rect )) return FALSE; + OffsetRect( surface_rect, -visible_rect->left, -visible_rect->top ); + surface_rect->left &= ~31; + surface_rect->top &= ~31; + surface_rect->right = max( surface_rect->left + 32, (surface_rect->right + 31) & ~31 ); + surface_rect->bottom = max( surface_rect->top + 32, (surface_rect->bottom + 31) & ~31 ); + return TRUE; } @@ -2198,6 +2198,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!data->whole_window && !data->embedded) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; if (data->vis.visualid != default_visual.visualid) goto done; + if (!get_surface_rect( visible_rect, &surface_rect )) goto done; if (*surface) window_surface_release( *surface ); *surface = NULL; /* indicate that we want to draw directly to the window */ @@ -2207,7 +2208,6 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (data->client_window) goto done; if (!client_side_graphics && !layered) goto done; - surface_rect = get_surface_rect( visible_rect ); if (data->surface) { if (EqualRect( &data->surface->rect, &surface_rect ))

1 0

Martin Storsjo : ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: ae49bc94b4b49363133e31a0d6c28cfb9f99b294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae49bc94b4b49363133e31a0… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:06:09 2018 +0200 ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 5e67f92..cb6fd4e 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -39,7 +39,7 @@ @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b142a17..5d12b4c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -94,7 +94,7 @@ @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) MSVCRT__setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index b2d11bc..c4f9f6a 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -33,7 +33,7 @@ @ stub __current_exception @ stub __current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy

1 0