October 2020 - Wine-Commits

Nikolay Sivov : evr: Partially implement MFCreateVideoSampleFromSurface().
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: db8f8591140edbe8ed97624ce392c857bb5c7053 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8f8591140edbe8ed97624c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 16:03:09 2020 +0300 evr: Partially implement MFCreateVideoSampleFromSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 7 - dlls/evr/sample.c | 701 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 98 ++++++- 3 files changed, 796 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db8f8591140edbe8ed97…

1 0

Hans Leidekker : dssenh: Implement CPSignHash.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: d176e537b3878e853ef6030e5ce9f0ad67396e72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d176e537b3878e853ef6030e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:55 2020 +0200 dssenh: Implement CPSignHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 34 +++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 12 +++++++----- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index b575689ab1..da269807bf 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -718,10 +718,42 @@ BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD return FALSE; } +static DWORD get_signature_length( DWORD algid ) +{ + switch (algid) + { + case AT_SIGNATURE: + case CALG_DSS_SIGN: return 40; + default: + FIXME( "unhandled algorithm %u\n", algid ); + return 0; + } +} + +#define MAX_HASH_LEN 20 BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const WCHAR *desc, DWORD flags, BYTE *sig, DWORD *siglen ) { - return FALSE; + struct container *container = (struct container *)hprov; + struct hash *hash = (struct hash *)hhash; + UCHAR hashval[MAX_HASH_LEN]; + ULONG len, hashlen = sizeof(hashval); + + TRACE( "%p, %p, %u, %s, %08x, %p, %p\n", (void *)hprov, (void *)hhash, keyspec, debugstr_w(desc), flags, sig, + siglen ); + + if (container->magic != MAGIC_CONTAINER || !container->sign_key) return FALSE; + if (hash->magic != MAGIC_HASH) return FALSE; + + if (!(len = get_signature_length( container->sign_key->algid ))) return FALSE; + if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; + if (*siglen < len) + { + *siglen = len; + return TRUE; + } + + return !BCryptSignHash( container->sign_key->handle, NULL, hashval, hashlen, sig, *siglen, siglen, 0 ); } BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 6ad1522592..c2ab37d288 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -889,12 +889,8 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(!memcmp(hashValue1, hashValue2, hashLen2), "Hashes were not identical.\n"); /* Sign hash 1 */ + signLen1 = 0; result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, NULL, &signLen1); - if (!result) - { - skip("skipping sign tests\n"); - return; - } ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen1 == 40, "Expected a 40-byte signature, got %d\n", signLen1); @@ -902,6 +898,7 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(result, "Failed to sign hash, got %x\n", GetLastError()); /* Sign hash 2 */ + signLen2 = 0; result = CryptSignHashA(hHash2, AT_SIGNATURE, NULL, 0, NULL, &signLen2); ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen2 == 40, "Expected a 40-byte signature, got %d\n", signLen2); @@ -943,6 +940,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Verify signed hash 1 */ result = CryptVerifySignatureA(hHash1, signValue1, sizeof(signValue1), pubKey, NULL, 0); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to verify signature, got %x\n", GetLastError()); result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash2);

1 0

Hans Leidekker : dssenh: Implement CPExportKey.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: e1374be7363d89be0e8f002ee4f6309e129d7184 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1374be7363d89be0e8f002e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:54 2020 +0200 dssenh: Implement CPExportKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 38f249ef04..b575689ab1 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include <stdarg.h> #include "windef.h" @@ -469,7 +468,29 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, BYTE *data, DWORD *len ) { - return FALSE; + struct key *key = (struct key *)hkey; + + TRACE( "%p, %p, %p, %08x, %08x, %p, %p\n", (void *)hprov, (void *)hkey, (void *)hexpkey, blobtype, flags, + data, len ); + + if (key->magic != MAGIC_KEY) return FALSE; + if (hexpkey) + { + FIXME( "export key not supported\n" ); + return FALSE; + } + if (blobtype != PUBLICKEYBLOB) + { + FIXME( "blob type %u not supported\n", blobtype ); + return FALSE; + } + if (flags) + { + FIXME( "flags %08x not supported\n", flags ); + return FALSE; + } + + return !BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PUBLIC_BLOB, data, *len, len, 0 ); } static struct key *duplicate_key( const struct key *key )

1 0

Georg Lehmann : winevulkan: Generate helpers for wrapped handles.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: e2518f6887f981f8f8f89807a0ca2bfba65dbeca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2518f6887f981f8f8f89807… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 13 19:28:35 2020 +0200 winevulkan: Generate helpers for wrapped handles. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 81 ++++++++++++++++++++++++++++++++++------ dlls/winevulkan/vulkan.c | 21 +---------- dlls/winevulkan/vulkan_private.h | 3 ++ dlls/winevulkan/vulkan_thunks.c | 32 ++++++++++++++++ 4 files changed, 106 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e2518f6887f981f8f8f8…

1 0

Georg Lehmann : winevulkan: Store a mapping from native handles to wrappers.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: af3d292343034b87403b1c8738e29bd3479fe87e URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3d292343034b87403b1c87… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 13 19:28:36 2020 +0200 winevulkan: Store a mapping from native handles to wrappers. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 74 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 26 ++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 3d1e8bd0ab..c140ff3a0e 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -66,11 +66,59 @@ static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device, VkPhysicalDeviceProperties *properties); +#define WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, object, native_handle) \ + wine_vk_add_handle_mapping((instance), (uint64_t) (uintptr_t) (object), (uint64_t) (uintptr_t) (native_handle), &(object)->mapping) +#define WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, native_handle) \ + wine_vk_add_handle_mapping((instance), (uint64_t) (uintptr_t) (object), (uint64_t) (native_handle), &(object)->mapping) +static void wine_vk_add_handle_mapping(struct VkInstance_T *instance, uint64_t wrapped_handle, + uint64_t native_handle, struct wine_vk_mapping *mapping) +{ + if (instance->enable_wrapper_list) + { + mapping->native_handle = native_handle; + mapping->wine_wrapped_handle = wrapped_handle; + AcquireSRWLockExclusive(&instance->wrapper_lock); + list_add_tail(&instance->wrappers, &mapping->link); + ReleaseSRWLockExclusive(&instance->wrapper_lock); + } +} + +#define WINE_VK_REMOVE_HANDLE_MAPPING(instance, object) \ + wine_vk_remove_handle_mapping((instance), &(object)->mapping) +static void wine_vk_remove_handle_mapping(struct VkInstance_T *instance, struct wine_vk_mapping *mapping) +{ + if (instance->enable_wrapper_list) + { + AcquireSRWLockExclusive(&instance->wrapper_lock); + list_remove(&mapping->link); + ReleaseSRWLockExclusive(&instance->wrapper_lock); + } +} + +static uint64_t wine_vk_get_wrapper(struct VkInstance_T *instance, uint64_t native_handle) +{ + struct wine_vk_mapping *mapping; + uint64_t result = 0; + + AcquireSRWLockShared(&instance->wrapper_lock); + LIST_FOR_EACH_ENTRY(mapping, &instance->wrappers, struct wine_vk_mapping, link) + { + if (mapping->native_handle == native_handle) + { + result = mapping->wine_wrapped_handle; + break; + } + } + ReleaseSRWLockShared(&instance->wrapper_lock); + return result; +} + static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { if (!phys_dev) return; + WINE_VK_REMOVE_HANDLE_MAPPING(phys_dev->instance, phys_dev); heap_free(phys_dev->extensions); heap_free(phys_dev); } @@ -91,6 +139,8 @@ static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstanc object->instance = instance; object->phys_dev = phys_dev; + WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, object, phys_dev); + res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, NULL, &num_host_properties, NULL); if (res != VK_SUCCESS) @@ -169,6 +219,7 @@ static void wine_vk_free_command_buffers(struct VkDevice_T *device, device->funcs.p_vkFreeCommandBuffers(device->device, pool->command_pool, 1, &buffers[i]->command_buffer); list_remove(&buffers[i]->pool_link); + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, buffers[i]); heap_free(buffers[i]); } } @@ -212,6 +263,8 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, { device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); } + + WINE_VK_ADD_DISPATCHABLE_MAPPING(device->phys_dev->instance, queue, queue->queue); } return queues; @@ -294,6 +347,8 @@ static void wine_vk_device_free(struct VkDevice_T *device) unsigned int i; for (i = 0; i < device->max_queue_families; i++) { + if (device->queues[i] && device->queues[i]->queue) + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, device->queues[i]); heap_free(device->queues[i]); } heap_free(device->queues); @@ -302,6 +357,7 @@ static void wine_vk_device_free(struct VkDevice_T *device) if (device->device && device->funcs.p_vkDestroyDevice) { + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, device); device->funcs.p_vkDestroyDevice(device->device, NULL /* pAllocator */); } @@ -466,7 +522,10 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) } if (instance->instance) + { vk_funcs->p_vkDestroyInstance(instance->instance, NULL /* allocator */); + WINE_VK_REMOVE_HANDLE_MAPPING(instance, instance); + } heap_free(instance); } @@ -512,6 +571,7 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); res = device->funcs.p_vkAllocateCommandBuffers(device->device, &allocate_info_host, &buffers[i]->command_buffer); + WINE_VK_ADD_DISPATCHABLE_MAPPING(device->phys_dev->instance, buffers[i], buffers[i]->command_buffer); if (res != VK_SUCCESS) { ERR("Failed to allocate command buffer, res=%d.\n", res); @@ -589,6 +649,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, return VK_ERROR_OUT_OF_HOST_MEMORY; object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + object->phys_dev = phys_dev; res = wine_vk_device_convert_create_info(create_info, &create_info_host); if (res != VK_SUCCESS) @@ -597,6 +658,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev, &create_info_host, NULL /* allocator */, &object->device); wine_vk_device_free_create_info(&create_info_host); + WINE_VK_ADD_DISPATCHABLE_MAPPING(phys_dev->instance, object, object->device); if (res != VK_SUCCESS) { WARN("Failed to create device, res=%d.\n", res); @@ -678,6 +740,8 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, return VK_ERROR_OUT_OF_HOST_MEMORY; } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + list_init(&object->wrappers); + InitializeSRWLock(&object->wrapper_lock); res = wine_vk_instance_convert_create_info(create_info, &create_info_host, object); if (res != VK_SUCCESS) @@ -695,6 +759,8 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, return res; } + WINE_VK_ADD_DISPATCHABLE_MAPPING(object, object, object->instance); + /* Load all instance functions we are aware of. Note the loader takes care * of any filtering for extensions which were not requested, but which the * ICD may support. @@ -1129,9 +1195,14 @@ VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCre res = device->funcs.p_vkCreateCommandPool(device->device, info, NULL, &object->command_pool); if (res == VK_SUCCESS) + { + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(device->phys_dev->instance, object, object->command_pool); *command_pool = wine_cmd_pool_to_handle(object); + } else + { heap_free(object); + } return res; } @@ -1156,9 +1227,12 @@ void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool handle, */ LIST_FOR_EACH_ENTRY_SAFE(buffer, cursor, &pool->command_buffers, struct VkCommandBuffer_T, pool_link) { + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, buffer); heap_free(buffer); } + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, pool); + device->funcs.p_vkDestroyCommandPool(device->device, pool->command_pool, NULL); heap_free(pool); } diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index bf09401c52..959a813a21 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -60,6 +60,16 @@ struct wine_vk_base UINT_PTR loader_magic; }; +/* Some extensions have callbacks for those we need to be able to + * get the wine wrapper for a native handle + */ +struct wine_vk_mapping +{ + struct list link; + uint64_t native_handle; + uint64_t wine_wrapped_handle; +}; + struct VkCommandBuffer_T { struct wine_vk_base base; @@ -67,18 +77,22 @@ struct VkCommandBuffer_T VkCommandBuffer command_buffer; /* native command buffer */ struct list pool_link; + struct wine_vk_mapping mapping; }; struct VkDevice_T { struct wine_vk_base base; struct vulkan_device_funcs funcs; + struct VkPhysicalDevice_T *phys_dev; /* parent */ VkDevice device; /* native device */ struct VkQueue_T **queues; uint32_t max_queue_families; unsigned int quirks; + + struct wine_vk_mapping mapping; }; struct VkInstance_T @@ -93,7 +107,13 @@ struct VkInstance_T struct VkPhysicalDevice_T **phys_devs; uint32_t phys_dev_count; + VkBool32 enable_wrapper_list; + struct list wrappers; + SRWLOCK wrapper_lock; + unsigned int quirks; + + struct wine_vk_mapping mapping; }; struct VkPhysicalDevice_T @@ -104,6 +124,8 @@ struct VkPhysicalDevice_T VkExtensionProperties *extensions; uint32_t extension_count; + + struct wine_vk_mapping mapping; }; struct VkQueue_T @@ -113,6 +135,8 @@ struct VkQueue_T VkQueue queue; /* native queue */ VkDeviceQueueCreateFlags flags; + + struct wine_vk_mapping mapping; }; struct wine_cmd_pool @@ -120,6 +144,8 @@ struct wine_cmd_pool VkCommandPool command_pool; struct list command_buffers; + + struct wine_vk_mapping mapping; }; static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool handle)

1 0

Hans Leidekker : bcrypt: Add support for duplicating asymmetric keys.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 6decf1730509b9aa697e0fd4c6fdd5da63c9af37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6decf1730509b9aa697e0fd4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:53 2020 +0200 bcrypt: Add support for duplicating asymmetric keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 97 +++++++++++++++++++++++-------------------- dlls/bcrypt/gnutls.c | 94 +++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/macos.c | 7 ++++ 4 files changed, 155 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6decf1730509b9aa697e…

1 0

Zebediah Figura : strmbase: Print colorimetry information in strmbase_dump_media_type().
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: ff01e58f732e027164a95189d29d5c794c32754c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff01e58f732e027164a95189… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 13 23:30:26 2020 -0500 strmbase: Print colorimetry information in strmbase_dump_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 9 ++++++ include/dvdmedia.h | 1 + include/dxva.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index c2560352aa..9544d1b8ba 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -21,6 +21,7 @@ #include "strmbase_private.h" #include "dvdmedia.h" +#include "dxva.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); @@ -132,6 +133,14 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#x, ", vih->dwCopyProtectFlags); TRACE("aspect ratio %u/%u, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); if (vih->u.dwControlFlags) TRACE("control flags %#x, ", vih->u.dwControlFlags); + if (vih->u.dwControlFlags & AMCONTROL_COLORINFO_PRESENT) + { + const DXVA_ExtendedFormat *colorimetry = (const DXVA_ExtendedFormat *)&vih->u.dwControlFlags; + + TRACE("chroma site %#x, range %#x, matrix %#x, lighting %#x, primaries %#x, transfer function %#x, ", + colorimetry->VideoChromaSubsampling, colorimetry->NominalRange, colorimetry->VideoTransferMatrix, + colorimetry->VideoLighting, colorimetry->VideoPrimaries, colorimetry->VideoTransferFunction); + } TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), diff --git a/include/dvdmedia.h b/include/dvdmedia.h index daf1c9d37c..6e625b472f 100644 --- a/include/dvdmedia.h +++ b/include/dvdmedia.h @@ -22,6 +22,7 @@ #define AMCONTROL_USED 0x00000001 #define AMCONTROL_PAD_TO_4x3 0x00000002 #define AMCONTROL_PAD_TO_16x9 0x00000004 +#define AMCONTROL_COLORINFO_PRESENT 0x00000080 typedef struct tagVIDEOINFOHEADER2 { RECT rcSource; diff --git a/include/dxva.h b/include/dxva.h index 25354f5887..4f18f2e60d 100644 --- a/include/dxva.h +++ b/include/dxva.h @@ -565,6 +565,88 @@ typedef struct _DXVA_Status_VPx #include <poppack.h> +typedef enum _DXVA_VideoChromaSubsampling +{ + DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes = 0x1, + DXVA_VideoChromaSubsampling_Vertically_Cosited = 0x2, + DXVA_VideoChromaSubsampling_Horizontally_Cosited = 0x4, + DXVA_VideoChromaSubsampling_ProgressiveChroma = 0x8, + + DXVA_VideoChromaSubsampling_Unknown = 0, + DXVA_VideoChromaSubsampling_Cosited = DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes + | DXVA_VideoChromaSubsampling_Vertically_Cosited + | DXVA_VideoChromaSubsampling_Horizontally_Cosited, + DXVA_VideoChromaSubsampling_DV_PAL = DXVA_VideoChromaSubsampling_Vertically_Cosited + | DXVA_VideoChromaSubsampling_Horizontally_Cosited, + DXVA_VideoChromaSubsampling_MPEG1 = DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes, + DXVA_VideoChromaSubsampling_MPEG2 = DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes + | DXVA_VideoChromaSubsampling_Horizontally_Cosited, +} DXVA_VideoChromaSubsampling; + +typedef enum _DXVA_NominalRange +{ + DXVA_NominalRange_Unknown = 0, + DXVA_NominalRange_0_255 = 1, + DXVA_NominalRange_16_235 = 2, + DXVA_NominalRange_48_208 = 3, + DXVA_NominalRange_Normal = DXVA_NominalRange_0_255, + DXVA_NominalRange_Wide = DXVA_NominalRange_16_235, +} DXVA_NominalRange; + +typedef enum _DXVA_VideoTransferMatrix +{ + DXVA_VideoTransferMatrix_Unknown = 0, + DXVA_VideoTransferMatrix_BT709 = 1, + DXVA_VideoTransferMatrix_BT601 = 2, + DXVA_VideoTransferMatrix_SMPTE240M = 3, +} DXVA_VideoTransferMatrix; + +typedef enum _DXVA_VideoLighting +{ + DXVA_VideoLighting_Unknown = 0, + DXVA_VideoLighting_bright = 1, + DXVA_VideoLighting_office = 2, + DXVA_VideoLighting_dim = 3, + DXVA_VideoLighting_dark = 4, +} DXVA_VideoLighting; + +typedef enum _DXVA_VideoPrimaries +{ + DXVA_VideoPrimaries_Unknown = 0, + DXVA_VideoPrimaries_reserved = 1, + DXVA_VideoPrimaries_BT709 = 2, + DXVA_VideoPrimaries_BT470_2_SysM = 3, + DXVA_VideoPrimaries_BT470_2_SysBG = 4, + DXVA_VideoPrimaries_SMPTE170M = 5, + DXVA_VideoPrimaries_SMPTE420M = 6, + DXVA_VideoPrimaries_EBU3213 = 7, + DXVA_VideoPrimaries_SMPTE_C = 8, +} DXVA_VideoPrimaries; + +typedef enum _DXVA_VideoTransferFunction +{ + DXVA_VideoTransFunc_Unknown = 0, + DXVA_VideoTransFunc_10 = 1, + DXVA_VideoTransFunc_18 = 2, + DXVA_VideoTransFunc_20 = 3, + DXVA_VideoTransFunc_22 = 4, + DXVA_VideoTransFunc_22_709 = 5, + DXVA_VideoTransFunc_22_240M = 6, + DXVA_VideoTransFunc_22_8bit_sRGB = 7, + DXVA_VideoTransFunc_28 = 8, +} DXVA_VideoTransferFunction; + +typedef struct _DXVA_ExtendedFormat +{ + UINT SampleFormat : 8; + UINT VideoChromaSubsampling : 4; + DXVA_NominalRange NominalRange : 3; + DXVA_VideoTransferMatrix VideoTransferMatrix : 3; + DXVA_VideoLighting VideoLighting : 4; + DXVA_VideoPrimaries VideoPrimaries : 5; + DXVA_VideoTransferFunction VideoTransferFunction : 5; +} DXVA_ExtendedFormat; + #ifdef __cplusplus } #endif

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: af33515989384d4090444c7c5d49776ddc16c5e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af33515989384d4090444c7c… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Oct 14 12:01:19 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index fb345e143e..b9003e98d4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-10-08 00:09+0300\n" +"PO-Revision-Date: 2020-10-14 12:00+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10562,16 +10562,12 @@ msgid "Egypt Daylight Time" msgstr "Egipto vasaros laikas" #: dlls/tzres/tzres.rc:104 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Centrinis juostinis laikas (Meksika)" +msgstr "Rytinis juostinis laikas (Meksika)" #: dlls/tzres/tzres.rc:105 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Centrinis vasaros laikas (Meksika)" +msgstr "Rytinis vasaros laikas (Meksika)" #: dlls/tzres/tzres.rc:148 msgid "Mauritius Standard Time"

1 0

Paul Gofman : kernelbase: Fix status check in GetExitCodeProcess().
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 976fa1b4919ded326c7322a623120881a584d8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=976fa1b4919ded326c7322a6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 14 11:20:08 2020 +0300 kernelbase: Fix status check in GetExitCodeProcess(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 0f707f82d1..57f0721f39 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -746,7 +746,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetExitCodeProcess( HANDLE process, LPDWORD exit_c PROCESS_BASIC_INFORMATION pbi; status = NtQueryInformationProcess( process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); - if (status && exit_code) *exit_code = pbi.ExitStatus; + if (!status && exit_code) *exit_code = pbi.ExitStatus; return set_ntstatus( status ); }

1 0

Myah Caron : kernelbase: Remove DECLSPEC_HOTPATCH for GetCommandLine[AW].
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 8a1933bbe40b67d22d919861deed9a7a68684433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1933bbe40b67d22d919861… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Tue Oct 13 19:43:31 2020 +0000 kernelbase: Remove DECLSPEC_HOTPATCH for GetCommandLine[AW]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48861 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index d5fedb4495..0f707f82d1 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1278,7 +1278,7 @@ BOOL WINAPI BaseFlushAppcompatCache(void) /*********************************************************************** * GetCommandLineA (kernelbase.@) */ -LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) +LPSTR WINAPI GetCommandLineA(void) { return command_lineA; } @@ -1287,7 +1287,7 @@ LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) /*********************************************************************** * GetCommandLineW (kernelbase.@) */ -LPWSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineW(void) +LPWSTR WINAPI GetCommandLineW(void) { return command_lineW; }

1 0

Myah Caron : kernelbase: Use command_lineW for GetCommandLineW.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: d01d3b749d7d99c75f29396fd79fab735ced2b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01d3b749d7d99c75f29396f… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Tue Oct 13 19:43:01 2020 +0000 kernelbase: Use command_lineW for GetCommandLineW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48861 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 11 +++++++++++ dlls/kernelbase/process.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 109322d684..7c6a0ff0a8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -872,6 +872,7 @@ static void test_CommandLine(void) PROCESS_INFORMATION info; STARTUPINFOA startup; BOOL ret; + LPWSTR cmdline, cmdline_backup; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1074,6 +1075,16 @@ static void test_CommandLine(void) ret = CreateProcessA(NULL, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(!ret, "CreateProcessA unexpectedly succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* Test whether GetCommandLineW reads directly from TEB or from a cached address */ + cmdline = GetCommandLineW(); + ok(cmdline == NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer, "Expected address from TEB, got %p\n", cmdline); + + cmdline_backup = cmdline; + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = NULL; + cmdline = GetCommandLineW(); + ok(cmdline == cmdline_backup, "Expected cached address from TEB, got %p\n", cmdline); + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = cmdline_backup; } static void test_Directory(void) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index e7998c00f2..d5fedb4495 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1289,7 +1289,7 @@ LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) */ LPWSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer; + return command_lineW; }

1 0

Georg Lehmann : winevulkan: Implement VK_EXT_debug_utils.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: bff6bc6a79ffc3a915219a6dfe64c9bcabaaeceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff6bc6a79ffc3a915219a6d… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 13 19:28:37 2020 +0200 winevulkan: Implement VK_EXT_debug_utils. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49813 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 10 +- dlls/winevulkan/vulkan.c | 207 +++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 29 ++++++ dlls/winevulkan/vulkan_thunks.c | 190 +++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 83 +++++++++++++++- include/wine/vulkan.h | 109 +++++++++++++++++++++ 6 files changed, 626 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bff6bc6a79ffc3a91521…

1 0

Paul Gofman : ntdll/tests: Test getting and setting AVX registers for the other thread.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 4e52f7ca865abf22c299501447805ab435399e27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e52f7ca865abf22c2995014… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 16:03:55 2020 +0300 ntdll/tests: Test getting and setting AVX registers for the other thread. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 362 ++++++++++++++++++++++++++++++------------- 1 file changed, 253 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e52f7ca865abf22c299…

1 0

Paul Gofman : ntdll/tests: Test AVX context with debugger.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: fa409a91b0f13e478a43c9adc84d3c870bbae432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa409a91b0f13e478a43c9ad… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 16:03:56 2020 +0300 ntdll/tests: Test AVX context with debugger. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 144 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 127 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 07b813ac1f..b2331b739a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -189,6 +189,67 @@ static BOOL is_wow64; static BOOL have_vectored_api; static int test_stage; +#if defined(__i386__) || defined(__x86_64__) +static void test_debugger_xstate(HANDLE thread, CONTEXT *ctx, int stage) +{ + char context_buffer[sizeof(CONTEXT) + sizeof(CONTEXT_EX) + sizeof(XSTATE) + 63]; + CONTEXT_EX *c_ex; + NTSTATUS status; + YMMCONTEXT *ymm; + CONTEXT *xctx; + DWORD length; + XSTATE *xs; + M128A *xmm; + BOOL bret; + + if (!pRtlGetEnabledExtendedFeatures || !pRtlGetEnabledExtendedFeatures(1 << XSTATE_AVX)) + return; + + if (stage == 14) + return; + + length = sizeof(context_buffer); + bret = pInitializeContext(context_buffer, ctx->ContextFlags | CONTEXT_XSTATE, &xctx, &length); + ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + + ymm = pLocateXStateFeature(xctx, XSTATE_AVX, &length); + ok(!!ymm, "Got zero ymm.\n"); + memset(ymm, 0xcc, sizeof(*ymm)); + + xmm = pLocateXStateFeature(xctx, XSTATE_LEGACY_SSE, &length); + ok(length == sizeof(*xmm) * (sizeof(void *) == 8 ? 16 : 8), "Got unexpected length %#x.\n", length); + ok(!!xmm, "Got zero xmm.\n"); + memset(xmm, 0xcc, length); + + status = pNtGetContextThread(thread, xctx); + ok(!status, "NtSetContextThread failed with 0x%x\n", status); + + c_ex = (CONTEXT_EX *)(xctx + 1); + xs = (XSTATE *)((char *)c_ex + c_ex->XState.Offset); + ok((xs->Mask & 7) == 4 || broken(!xs->Mask) /* Win7 */, + "Got unexpected xs->Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + + ok(xmm[0].Low == 0x200000001, "Got unexpected data %s.\n", wine_dbgstr_longlong(xmm[0].Low)); + ok(xmm[0].High == 0x400000003, "Got unexpected data %s.\n", wine_dbgstr_longlong(xmm[0].High)); + + ok(ymm->Ymm0.Low == 0x600000005 || broken(!xs->Mask && ymm->Ymm0.Low == 0xcccccccccccccccc) /* Win7 */, + "Got unexpected data %s.\n", wine_dbgstr_longlong(ymm->Ymm0.Low)); + ok(ymm->Ymm0.High == 0x800000007 || broken(!xs->Mask && ymm->Ymm0.High == 0xcccccccccccccccc) /* Win7 */, + "Got unexpected data %s.\n", wine_dbgstr_longlong(ymm->Ymm0.High)); + + xmm = pLocateXStateFeature(ctx, XSTATE_LEGACY_SSE, &length); + ok(!!xmm, "Got zero xmm.\n"); + + xmm[0].Low = 0x2828282828282828; + xmm[0].High = xmm[0].Low; + ymm->Ymm0.Low = 0x4848484848484848; + ymm->Ymm0.High = ymm->Ymm0.Low; + + status = pNtSetContextThread(thread, xctx); + ok(!status, "NtSetContextThread failed with 0x%x\n", status); +} +#endif + #ifdef __i386__ #ifndef __WINE_WINTRNL_H @@ -1055,7 +1116,7 @@ static void test_debugger(void) sizeof(stage), &size_read); ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); - ctx.ContextFlags = CONTEXT_FULL; + ctx.ContextFlags = CONTEXT_FULL | CONTEXT_EXTENDED_REGISTERS; status = pNtGetContextThread(pi.hThread, &ctx); ok(!status, "NtGetContextThread failed with 0x%x\n", status); @@ -1156,6 +1217,10 @@ static void test_debugger(void) if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 14 || stage == 15) + { + test_debugger_xstate(pi.hThread, &ctx, stage); + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -3331,6 +3396,10 @@ static void test_debugger(void) if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 14 || stage == 15) + { + test_debugger_xstate(pi.hThread, &ctx, stage); + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -5957,6 +6026,57 @@ static void test_breakpoint(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +#if defined(__i386__) || defined(__x86_64__) +static BYTE except_code_set_ymm0[] = +{ +#ifdef __x86_64__ + 0x48, +#endif + 0xb8, /* mov imm,%ax */ + 0x00, 0x00, 0x00, 0x00, +#ifdef __x86_64__ + 0x00, 0x00, 0x00, 0x00, +#endif + + 0xc5, 0xfc, 0x10, 0x00, /* vmovups (%ax),%ymm0 */ + 0xcc, /* int3 */ + 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ + 0xc3, /* ret */ +}; + +static void test_debuggee_xstate(void) +{ + void (CDECL *func)(void) = code_mem; + unsigned int address_offset, i; + unsigned int data[8]; + + if (!pRtlGetEnabledExtendedFeatures || !pRtlGetEnabledExtendedFeatures(1 << XSTATE_AVX)) + { + memcpy(code_mem, breakpoint_code, sizeof(breakpoint_code)); + func(); + return; + } + + memcpy(code_mem, except_code_set_ymm0, sizeof(except_code_set_ymm0)); + address_offset = sizeof(void *) == 8 ? 2 : 1; + *(void **)((BYTE *)code_mem + address_offset) = data; + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = i + 1; + + func(); + + for (i = 0; i < 4; ++i) + ok(data[i] == (test_stage == 14 ? i + 1 : 0x28282828), + "Got unexpected data %#x, test_stage %u, i %u.\n", data[i], test_stage, i); + + for ( ; i < ARRAY_SIZE(data); ++i) + ok(data[i] == (test_stage == 14 ? i + 1 : 0x48484848) + || broken(test_stage == 15 && data[i] == i + 1) /* Win7 */, + "Got unexpected data %#x, test_stage %u, i %u.\n", data[i], test_stage, i); +} +#endif + static DWORD invalid_handle_exceptions; static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -6593,22 +6713,6 @@ static void wait_for_thread_next_suspend(HANDLE thread) static void test_extended_context(void) { - static BYTE except_code_set_ymm0[] = - { -#ifdef __x86_64__ - 0x48, -#endif - 0xb8, /* mov imm,%ax */ - 0x00, 0x00, 0x00, 0x00, -#ifdef __x86_64__ - 0x00, 0x00, 0x00, 0x00, -#endif - - 0xc5, 0xfc, 0x10, 0x00, /* vmovups (%ax),%ymm0 */ - 0xcc, /* int3 */ - 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ - 0xc3, /* ret */ - }; static BYTE except_code_reset_ymm_state[] = { #ifdef __x86_64__ @@ -8029,6 +8133,12 @@ START_TEST(exception) test_closehandle(1, (HANDLE)0xdeadbeef); test_stage = 13; test_closehandle(0, 0); /* Special case. */ +#if defined(__i386__) || defined(__x86_64__) + test_stage = 14; + test_debuggee_xstate(); + test_stage = 15; + test_debuggee_xstate(); +#endif /* rest of tests only run in parent */ return;

1 0

Brendan Shanks : mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 33c8a4254715c5f3b71b23fc657c6ba5eee94ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33c8a4254715c5f3b71b23fc… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 6 13:36:28 2020 -0700 mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer. On macOS 10.15 and newer, trying to open the device node of a removable drive will trigger an "<app> would like to access files on a removable volume" permission prompt, even if the user doesn't have permissions to access the device node (which is almost always the case). Check the value of access() (recommended by Apple for this purpose) before opening devices. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 9 +++++++++ dlls/mountmgr.sys/diskarb.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ccb0685ced..6db088f11e 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> #include <fcntl.h> +#include <unistd.h> #include <sys/time.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> @@ -1026,6 +1027,14 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!unix_device) return FALSE; +#ifdef __APPLE__ + if (access( unix_device, R_OK )) + { + WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device)); + return FALSE; + } +#endif + if (!(name = wine_get_dos_file_name( unix_device ))) { ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 12da89d768..25e0745372 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,6 +25,7 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif @@ -150,7 +151,8 @@ static void appeared_callback( DADiskRef disk, void *context ) else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL ); - if ((fd = open( device, O_RDONLY )) >= 0) + if (!access( device, R_OK ) && + (fd = open( device, O_RDONLY )) >= 0) { dk_scsi_identify_t dsi;

1 0

Arkadiusz Hiler : user32: Implement GetMouseMovePointsEx().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: f7edc328184c4755c81dec5372b3ae5ac7b8c5df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7edc328184c4755c81dec53… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Sat Oct 3 02:44:16 2020 +0300 user32: Implement GetMouseMovePointsEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36873 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 58 ++++++++++-- dlls/user32/tests/input.c | 200 ++++++++++++++++++++++++++++++++++++++++- include/wine/server_protocol.h | 26 +++++- server/protocol.def | 15 ++++ server/queue.c | 31 ++++++- server/request.h | 4 + server/trace.c | 31 +++++++ 7 files changed, 352 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7edc328184c4755c81d…

1 0

Alistair Leslie-Hughes : xactengine3_7: Initial IXACT3Engine tests.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: f4a66ad257df4605e73dfea792eec55a70a04e84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4a66ad257df4605e73dfea7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 7 17:51:58 2020 +1100 xactengine3_7: Initial IXACT3Engine tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xactengine3_7/tests/Makefile.in | 5 ++ dlls/xactengine3_7/tests/xact3.c | 100 +++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+) diff --git a/configure b/configure index 31a26763ae..5672688a0d 100755 --- a/configure +++ b/configure @@ -21168,6 +21168,7 @@ wine_fn_config_makefile dlls/xactengine3_4 enable_xactengine3_4 wine_fn_config_makefile dlls/xactengine3_5 enable_xactengine3_5 wine_fn_config_makefile dlls/xactengine3_6 enable_xactengine3_6 wine_fn_config_makefile dlls/xactengine3_7 enable_xactengine3_7 +wine_fn_config_makefile dlls/xactengine3_7/tests enable_tests wine_fn_config_makefile dlls/xapofx1_1 enable_xapofx1_1 wine_fn_config_makefile dlls/xapofx1_2 enable_xapofx1_2 wine_fn_config_makefile dlls/xapofx1_3 enable_xapofx1_3 diff --git a/configure.ac b/configure.ac index 865aa924d0..a57697a0dd 100644 --- a/configure.ac +++ b/configure.ac @@ -3915,6 +3915,7 @@ WINE_CONFIG_MAKEFILE(dlls/xactengine3_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_5) WINE_CONFIG_MAKEFILE(dlls/xactengine3_6) WINE_CONFIG_MAKEFILE(dlls/xactengine3_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_7/tests) WINE_CONFIG_MAKEFILE(dlls/xapofx1_1) WINE_CONFIG_MAKEFILE(dlls/xapofx1_2) WINE_CONFIG_MAKEFILE(dlls/xapofx1_3) diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in new file mode 100644 index 0000000000..c32b256254 --- /dev/null +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = xactengine3_7.dll +IMPORTS = ole32 + +C_SRCS = \ + xact3.c diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c new file mode 100644 index 0000000000..9b0d3defb0 --- /dev/null +++ b/dlls/xactengine3_7/tests/xact3.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <math.h> +#include <limits.h> +#include <float.h> + +#define COBJMACROS +#include "wine/test.h" + +#include "x3daudio.h" + +#include "initguid.h" +#include "xact3.h" + +DEFINE_GUID(IID_IXACT3Engine30, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +DEFINE_GUID(IID_IXACT3Engine31, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); + +DEFINE_GUID(CLSID_XACTEngine30, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +DEFINE_GUID(CLSID_XACTEngine31, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +DEFINE_GUID(CLSID_XACTEngine32, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +DEFINE_GUID(CLSID_XACTEngine33, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +DEFINE_GUID(CLSID_XACTEngine34, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +DEFINE_GUID(CLSID_XACTEngine35, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +DEFINE_GUID(CLSID_XACTEngine36, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); + +struct xact_interfaces +{ + REFGUID clsid; + REFIID iid; + HRESULT expected; +} xact_interfaces[] = +{ + {&CLSID_XACTEngine30, &IID_IXACT3Engine30, S_OK }, + {&CLSID_XACTEngine30, &IID_IXACT3Engine31, E_NOINTERFACE}, + {&CLSID_XACTEngine30, &IID_IXACT3Engine, E_NOINTERFACE }, + + /* Version 3.1 to 3.4 use the same inteface */ + {&CLSID_XACTEngine31, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine32, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine33, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine34, &IID_IXACT3Engine31, S_OK }, + + /* Version 3.5 to 3.7 use the same inteface */ + {&CLSID_XACTEngine35, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine35, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine36, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine36, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine, &IID_IXACT3Engine, S_OK }, + {&CLSID_XACTEngine, &IID_IUnknown, S_OK }, +}; + +static void test_interfaces(void) +{ + IUnknown *unk; + HRESULT hr; + int i; + + for (i = 0; i < ARRAY_SIZE(xact_interfaces); i++) + { + hr = CoCreateInstance(xact_interfaces[i].clsid, NULL, CLSCTX_INPROC_SERVER, + xact_interfaces[i].iid, (void**)&unk); + if (hr == REGDB_E_CLASSNOTREG) + { + trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) ); + continue; + } + ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr); + if (hr == S_OK) + IUnknown_Release(unk); + } +} + +START_TEST(xact3) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +}

1 0

Paul Gofman : ntdll: Zero all FLS slots instances in RtlFlsFree().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 7341f4ad1e771f32d8276734774bfa9ba352f259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7341f4ad1e771f32d8276734… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 05:51:26 2020 +0300 ntdll: Zero all FLS slots instances in RtlFlsFree(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index cf6bddab0b..95511391d3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -392,7 +392,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) { unsigned int chunk_index, idx; FLS_INFO_CHUNK *chunk; - TEB_FLS_DATA *fls; + LIST_ENTRY *entry; lock_fls_data(); @@ -410,10 +410,15 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) return STATUS_INVALID_PARAMETER; } - if ((fls = NtCurrentTeb()->FlsSlots) && fls->fls_data_chunks[chunk_index]) + for (entry = fls_data.fls_list_head.Flink; entry != &fls_data.fls_list_head; entry = entry->Flink) { - /* FIXME: call Fls callback */ - fls->fls_data_chunks[chunk_index][idx + 1] = NULL; + TEB_FLS_DATA *fls = CONTAINING_RECORD(entry, TEB_FLS_DATA, fls_list_entry); + + if (fls->fls_data_chunks[chunk_index]) + { + /* FIXME: call Fls callback */ + fls->fls_data_chunks[chunk_index][idx + 1] = NULL; + } } --chunk->count;

1 0

Paul Gofman : ntdll: Call FLS callbacks.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: ec1ea1ea1b2469a526f4bbc38aab404b7a2b062c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec1ea1ea1b2469a526f4bbc3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 05:51:27 2020 +0300 ntdll: Call FLS callbacks. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 24 +++++++++++--- dlls/kernel32/tests/loader.c | 79 ++++++++++++++++++++++++++++++++------------ dlls/ntdll/loader.c | 8 ++++- dlls/ntdll/thread.c | 40 +++++++++++++++++++--- 4 files changed, 119 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec1ea1ea1b2469a526f4…

1 0

Paul Gofman : ntdll: Support AVX registers for other thread in Nt{Get|Set}ContextThread().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 419abd49a1f816e5a869dbf4cc81114cd516138b URL: https://source.winehq.org/git/wine.git/?a=commit;h=419abd49a1f816e5a869dbf4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 16:03:54 2020 +0300 ntdll: Support AVX registers for other thread in Nt{Get|Set}ContextThread(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 7 ++++++ dlls/ntdll/unix/signal_i386.c | 31 ++++++++++++++--------- dlls/ntdll/unix/signal_x86_64.c | 35 ++++++++++++++++++-------- dlls/ntdll/unix/thread.c | 36 +++++++++++++++++++++++--- dlls/ntdll/unix/unix_private.h | 56 +++++++++++++++++++++++++++++++++++------ include/wine/server_protocol.h | 5 ++++ server/protocol.def | 5 ++++ server/thread.c | 1 + server/trace.c | 6 +++++ 9 files changed, 148 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=419abd49a1f816e5a869…

1 0

Sven Baars : d3dcompiler: Fix a leak on error path (Coverity).
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 9f9fec18799bf59df6211b7294f8d338caa7f4db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f9fec18799bf59df6211b72… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 22:39:11 2020 +0200 d3dcompiler: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index df39716b49..21ad98f2b5 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1446,7 +1446,7 @@ static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsig struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) { - struct hlsl_ir_assignment *assign = d3dcompiler_alloc(sizeof(*assign)); + struct hlsl_ir_assignment *assign; struct hlsl_type *lhs_type; DWORD writemask = 0; @@ -1459,6 +1459,7 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh return NULL; } + assign = d3dcompiler_alloc(sizeof(*assign)); if (!assign) { ERR("Out of memory\n");

1 0

Jacek Caban : kernelbase: Remove no longer needed free_console server call from FreeConsole.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 1b672d1013056d6a017605b8f8b7a8aca7ff16cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b672d1013056d6a017605b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:28:45 2020 +0200 kernelbase: Remove no longer needed free_console server call from FreeConsole. We can depend on closing console connection handle now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 143644e233..d073b77eaa 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -584,7 +584,6 @@ HANDLE get_console_wait_handle( HANDLE handle ) BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) { HANDLE event; - BOOL ret; RtlEnterCriticalSection( &console_section ); @@ -599,15 +598,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) if (console_flags & CONSOLE_ERROR_HANDLE) NtClose( GetStdHandle( STD_ERROR_HANDLE )); console_flags = 0; - SERVER_START_REQ( free_console ) - { - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; if ((event = InterlockedExchangePointer( &console_wait_event, NULL ))) NtClose( event ); RtlLeaveCriticalSection( &console_section ); - return ret; + return TRUE; }

1 0

Henri Verbeet : wined3d: Clear the graphics pipeline key stencil test state when the stencil test is disabled.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: e154c95355227659524dd449e73f08a48e3b951c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e154c95355227659524dd449… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 17:08:54 2020 +0330 wined3d: Clear the graphics pipeline key stencil test state when the stencil test is disabled. The state itself is ignored in this case, but could still cause additional pipeline variants to be created. That's mostly a consideration for Direct3D 9 and before, since Direct3D 10 and 11 already normalise disabled stencil test state themselves. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 92b8c14e23..f125884215 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2080,6 +2080,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } + else + { + memset(&key->ds_desc.front, 0, sizeof(key->ds_desc.front)); + memset(&key->ds_desc.back, 0, sizeof(key->ds_desc.back)); + } } else {

1 0

Nikolay Sivov : mf/evr: Trigger media type negotiation through presenter for reference stream.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 421924ae0a780e6e3304d123b68cb2214f79f626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=421924ae0a780e6e3304d123… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:45 2020 +0300 mf/evr: Trigger media type negotiation through presenter for reference stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 298d320ec0..1d55344fe1 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -419,6 +419,8 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH return MF_E_STREAMSINK_REMOVED; hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, type, 0); + if (SUCCEEDED(hr) && !stream->id) + hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); return hr; }

1 0

Jacek Caban : kernelbase: Remove window position adjustment from SetConsoleCursorPosition.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: eca4d91cad48922f0ec881f79913e4b0162adbec URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca4d91cad48922f0ec881f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:28:12 2020 +0200 kernelbase: Remove window position adjustment from SetConsoleCursorPosition. It's done in conhost now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 4f511b1637..143644e233 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1183,46 +1183,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorPosition( HANDLE handle, COORD pos ) { struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_POS }; - CONSOLE_SCREEN_BUFFER_INFO info; - int w, h, do_move = 0; TRACE( "%p %d %d\n", handle, pos.X, pos.Y ); params.info.cursor_x = pos.X; params.info.cursor_y = pos.Y; - if (!console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL )) - return FALSE; - - if (!GetConsoleScreenBufferInfo( handle, &info )) return FALSE; - - /* if cursor is no longer visible, scroll the visible window... */ - w = info.srWindow.Right - info.srWindow.Left + 1; - h = info.srWindow.Bottom - info.srWindow.Top + 1; - if (pos.X < info.srWindow.Left) - { - info.srWindow.Left = min(pos.X, info.dwSize.X - w); - do_move = 1; - } - else if (pos.X > info.srWindow.Right) - { - info.srWindow.Left = max(pos.X, w) - w + 1; - do_move = 1; - } - info.srWindow.Right = info.srWindow.Left + w - 1; - - if (pos.Y < info.srWindow.Top) - { - info.srWindow.Top = min(pos.Y, info.dwSize.Y - h); - do_move = 1; - } - else if (pos.Y > info.srWindow.Bottom) - { - info.srWindow.Top = max(pos.Y, h) - h + 1; - do_move = 1; - } - info.srWindow.Bottom = info.srWindow.Top + h - 1; - - return !do_move || SetConsoleWindowInfo( handle, TRUE, &info.srWindow ); + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0