April 2021 - Wine-Commits - list.winehq.org

Jacek Caban : winevulkan: Use pthread_rwlock_t in VkInstance_T.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 504213c9a74bf243bccd68a605cbecf0ac02ee50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=504213c9a74bf243bccd68a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 13 00:53:31 2021 +0200 winevulkan: Use pthread_rwlock_t in VkInstance_T. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/vulkan.c | 15 ++++++++------- dlls/winevulkan/vulkan_private.h | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index f95a1e3113a..61ab6a127a5 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,6 +1,7 @@ MODULE = winevulkan.dll IMPORTLIB = winevulkan IMPORTS = user32 gdi32 advapi32 setupapi +EXTRALIBS = $(PTHREAD_LIBS) C_SRCS = \ vulkan.c \ diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 220528a8b86..0b47aa1d3e2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -91,9 +91,9 @@ static void wine_vk_add_handle_mapping(struct VkInstance_T *instance, uint64_t { mapping->native_handle = native_handle; mapping->wine_wrapped_handle = wrapped_handle; - AcquireSRWLockExclusive(&instance->wrapper_lock); + pthread_rwlock_wrlock(&instance->wrapper_lock); list_add_tail(&instance->wrappers, &mapping->link); - ReleaseSRWLockExclusive(&instance->wrapper_lock); + pthread_rwlock_unlock(&instance->wrapper_lock); } } @@ -103,9 +103,9 @@ static void wine_vk_remove_handle_mapping(struct VkInstance_T *instance, struct { if (instance->enable_wrapper_list) { - AcquireSRWLockExclusive(&instance->wrapper_lock); + pthread_rwlock_wrlock(&instance->wrapper_lock); list_remove(&mapping->link); - ReleaseSRWLockExclusive(&instance->wrapper_lock); + pthread_rwlock_unlock(&instance->wrapper_lock); } } @@ -114,7 +114,7 @@ static uint64_t wine_vk_get_wrapper(struct VkInstance_T *instance, uint64_t nati struct wine_vk_mapping *mapping; uint64_t result = 0; - AcquireSRWLockShared(&instance->wrapper_lock); + pthread_rwlock_rdlock(&instance->wrapper_lock); LIST_FOR_EACH_ENTRY(mapping, &instance->wrappers, struct wine_vk_mapping, link) { if (mapping->native_handle == native_handle) @@ -123,7 +123,7 @@ static uint64_t wine_vk_get_wrapper(struct VkInstance_T *instance, uint64_t nati break; } } - ReleaseSRWLockShared(&instance->wrapper_lock); + pthread_rwlock_unlock(&instance->wrapper_lock); return result; } @@ -666,6 +666,7 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) WINE_VK_REMOVE_HANDLE_MAPPING(instance, instance); } + pthread_rwlock_destroy(&instance->wrapper_lock); free(instance->utils_messengers); free(instance); @@ -882,7 +883,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; list_init(&object->wrappers); - InitializeSRWLock(&object->wrapper_lock); + pthread_rwlock_init(&object->wrapper_lock, NULL); res = wine_vk_instance_convert_create_info(create_info, &create_info_host, object); if (res != VK_SUCCESS) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 322d27079ea..6574d282eea 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -25,6 +25,8 @@ #define USE_STRUCT_CONVERSION #endif +#include <pthread.h> + #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" @@ -123,7 +125,7 @@ struct VkInstance_T VkBool32 enable_wrapper_list; struct list wrappers; - SRWLOCK wrapper_lock; + pthread_rwlock_t wrapper_lock; struct wine_debug_utils_messenger *utils_messengers; uint32_t utils_messenger_count;

1 0

Jacek Caban : winevulkan: Move registration functions to new loader.c file.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 4278a30e6396d69e721fd6620efcb33f9d38acc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4278a30e6396d69e721fd662… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 13 00:54:09 2021 +0200 winevulkan: Move registration functions to new loader.c file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/loader.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 75 -------------------------------- 3 files changed, 105 insertions(+), 75 deletions(-) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index 61ab6a127a5..1ba76407f91 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = user32 gdi32 advapi32 setupapi EXTRALIBS = $(PTHREAD_LIBS) C_SRCS = \ + loader.c \ vulkan.c \ vulkan_thunks.c diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c new file mode 100644 index 00000000000..f40b058e0ee --- /dev/null +++ b/dlls/winevulkan/loader.c @@ -0,0 +1,104 @@ +/* Wine Vulkan ICD implementation + * + * Copyright 2017 Roderick Colenbrander + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" + +#include "vulkan_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vulkan); + +static HINSTANCE hinstance; + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + hinstance = hinst; + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} + +static const WCHAR winevulkan_json_resW[] = {'w','i','n','e','v','u','l','k','a','n','_','j','s','o','n',0}; +static const WCHAR winevulkan_json_pathW[] = {'\\','w','i','n','e','v','u','l','k','a','n','.','j','s','o','n',0}; +static const WCHAR vulkan_driversW[] = {'S','o','f','t','w','a','r','e','\\','K','h','r','o','n','o','s','\\', + 'V','u','l','k','a','n','\\','D','r','i','v','e','r','s',0}; + +HRESULT WINAPI DllRegisterServer(void) +{ + WCHAR json_path[MAX_PATH]; + HRSRC rsrc; + const char *data; + DWORD datalen, written, zero = 0; + HANDLE file; + HKEY key; + + /* Create the JSON manifest and registry key to register this ICD with the official Vulkan loader. */ + TRACE("\n"); + rsrc = FindResourceW(hinstance, winevulkan_json_resW, (const WCHAR *)RT_RCDATA); + data = LockResource(LoadResource(hinstance, rsrc)); + datalen = SizeofResource(hinstance, rsrc); + + GetSystemDirectoryW(json_path, ARRAY_SIZE(json_path)); + lstrcatW(json_path, winevulkan_json_pathW); + file = CreateFileW(json_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + { + ERR("Unable to create JSON manifest.\n"); + return E_UNEXPECTED; + } + WriteFile(file, data, datalen, &written, NULL); + CloseHandle(file); + + if (!RegCreateKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, 0, NULL, 0, KEY_SET_VALUE, NULL, &key, NULL)) + { + RegSetValueExW(key, json_path, 0, REG_DWORD, (const BYTE *)&zero, sizeof(zero)); + RegCloseKey(key); + } + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + WCHAR json_path[MAX_PATH]; + HKEY key; + + /* Remove the JSON manifest and registry key */ + TRACE("\n"); + GetSystemDirectoryW(json_path, ARRAY_SIZE(json_path)); + lstrcatW(json_path, winevulkan_json_pathW); + DeleteFileW(json_path); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, 0, KEY_SET_VALUE, &key) == ERROR_SUCCESS) + { + RegDeleteValueW(key, json_path); + RegCloseKey(key); + } + + return S_OK; +} diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 0b47aa1d3e2..aff2cb933af 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -73,7 +73,6 @@ static uint32_t wine_vk_count_struct_(void *s, VkStructureType t) static void *wine_vk_get_global_proc_addr(const char *name); -static HINSTANCE hinstance; static const struct vulkan_funcs *vk_funcs; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); @@ -2105,20 +2104,6 @@ VkResult WINAPI wine_vkDebugMarkerSetObjectNameEXT(VkDevice device, const VkDebu return thunk_vkDebugMarkerSetObjectNameEXT(device, &wine_name_info); } -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_PROCESS_ATTACH: - hinstance = hinst; - DisableThreadLibraryCalls(hinst); - break; - } - return TRUE; -} - static const struct vulkan_func vk_global_dispatch_table[] = { /* These functions must call wine_vk_init_once() before accessing vk_funcs. */ @@ -2157,63 +2142,3 @@ void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) return vk_funcs->p_vkGetInstanceProcAddr(instance, name); } - - -static const WCHAR winevulkan_json_resW[] = {'w','i','n','e','v','u','l','k','a','n','_','j','s','o','n',0}; -static const WCHAR winevulkan_json_pathW[] = {'\\','w','i','n','e','v','u','l','k','a','n','.','j','s','o','n',0}; -static const WCHAR vulkan_driversW[] = {'S','o','f','t','w','a','r','e','\\','K','h','r','o','n','o','s','\\', - 'V','u','l','k','a','n','\\','D','r','i','v','e','r','s',0}; - -HRESULT WINAPI DllRegisterServer(void) -{ - WCHAR json_path[MAX_PATH]; - HRSRC rsrc; - const char *data; - DWORD datalen, written, zero = 0; - HANDLE file; - HKEY key; - - /* Create the JSON manifest and registry key to register this ICD with the official Vulkan loader. */ - TRACE("\n"); - rsrc = FindResourceW(hinstance, winevulkan_json_resW, (const WCHAR *)RT_RCDATA); - data = LockResource(LoadResource(hinstance, rsrc)); - datalen = SizeofResource(hinstance, rsrc); - - GetSystemDirectoryW(json_path, ARRAY_SIZE(json_path)); - lstrcatW(json_path, winevulkan_json_pathW); - file = CreateFileW(json_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (file == INVALID_HANDLE_VALUE) - { - ERR("Unable to create JSON manifest.\n"); - return E_UNEXPECTED; - } - WriteFile(file, data, datalen, &written, NULL); - CloseHandle(file); - - if (!RegCreateKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, 0, NULL, 0, KEY_SET_VALUE, NULL, &key, NULL)) - { - RegSetValueExW(key, json_path, 0, REG_DWORD, (const BYTE *)&zero, sizeof(zero)); - RegCloseKey(key); - } - return S_OK; -} - -HRESULT WINAPI DllUnregisterServer(void) -{ - WCHAR json_path[MAX_PATH]; - HKEY key; - - /* Remove the JSON manifest and registry key */ - TRACE("\n"); - GetSystemDirectoryW(json_path, ARRAY_SIZE(json_path)); - lstrcatW(json_path, winevulkan_json_pathW); - DeleteFileW(json_path); - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, 0, KEY_SET_VALUE, &key) == ERROR_SUCCESS) - { - RegDeleteValueW(key, json_path); - RegCloseKey(key); - } - - return S_OK; -}

1 0

Paul Gofman : ntdll: Remove wait timeout in get_thread_context().
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 3386560057c0d30461af0973fd9dac9871387143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3386560057c0d30461af0973… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 12 22:14:03 2021 +0300 ntdll: Remove wait timeout in get_thread_context(). Fixes hangs during loading or after campaign start in Mount & Blade II: Bannerlord. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 1a882a99855..543a214e056 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -617,13 +617,8 @@ NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int fla if (ret == STATUS_PENDING) { - LARGE_INTEGER timeout; - timeout.QuadPart = -1000000; - if (NtWaitForSingleObject( handle, FALSE, &timeout )) - { - NtClose( handle ); - return STATUS_ACCESS_DENIED; - } + NtWaitForSingleObject( handle, FALSE, NULL ); + SERVER_START_REQ( get_thread_context ) { req->handle = wine_server_obj_handle( handle );

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_unmap().
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 84786611fd379ed0b8d151515926456d999c503d URL: https://source.winehq.org/git/wine.git/?a=commit;h=84786611fd379ed0b8d15151… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 12 22:46:33 2021 -0500 d3d11: Use wined3d_device_context_unmap(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6944c479e60..47f865ed14c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -631,6 +631,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext1 *iface, ID3D11Resource *resource, UINT subresource_idx) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_resource; TRACE("iface %p, resource %p, subresource_idx %u.\n", iface, resource, subresource_idx); @@ -638,7 +639,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext1 wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); - wined3d_resource_unmap(wined3d_resource, subresource_idx); + wined3d_device_context_unmap(context->wined3d_context, wined3d_resource, subresource_idx); wined3d_mutex_unlock(); }

1 0

Jacek Caban : winevulkan: Use standard CRT memory allocators.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: a27d5bae114eef5352b699ee38975bc8793b4dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a27d5bae114eef5352b699ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 13 00:53:17 2021 +0200 winevulkan: Use standard CRT memory allocators. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 8 +- dlls/winevulkan/vulkan.c | 111 +++++++------- dlls/winevulkan/vulkan_thunks.c | 322 ++++++++++++++++++++-------------------- 3 files changed, 221 insertions(+), 220 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a27d5bae114eef5352b6…

1 0

Nikolay Sivov : mfplay: Handle shutdown state on GetMediaItem().
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: e2f74ce448d5e8118c7353c1a593414fc9be61af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f74ce448d5e8118c7353c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:32 2021 +0300 mfplay: Handle shutdown state on GetMediaItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 4 +++- dlls/mfplay/tests/mfplay.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index a45c5ac9ffa..e061e21acb8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -998,7 +998,9 @@ static HRESULT WINAPI media_player_GetMediaItem(IMFPMediaPlayer *iface, IMFPMedi return E_POINTER; EnterCriticalSection(&player->cs); - if (!player->item) + if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + hr = MF_E_SHUTDOWN; + else if (!player->item) hr = MF_E_NOT_FOUND; else { diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index c9a07ca9d81..64a48cceaca 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -163,7 +163,6 @@ static void test_shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_GetMediaItem(player, &item); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFPMediaPlayer_GetVideoWindow(player, &window);

1 0

Andrew Sheldon : wined3d: Add GPU information for Radeon RX 6800(XT) / 6900 XT.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: d1b2eea4218dfb5d08ce2732eb6df9a283f00e0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b2eea4218dfb5d08ce2732… Author: Andrew Sheldon <asheldon55(a)gmail.com> Date: Tue Apr 13 12:58:40 2021 +1000 wined3d: Add GPU information for Radeon RX 6800(XT) / 6900 XT. Signed-off-by: Andrew Sheldon <asheldon55(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7287b333f97..0a3c547e7a9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -514,6 +514,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34ec814685c..af7237ae4f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,6 +2903,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, + CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_map().
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: d6606efbaa95f379e79071712bc74c1e5450c8a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6606efbaa95f379e7907171… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 12 22:46:31 2021 -0500 d3d11: Use wined3d_device_context_map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9845f93eebf..6944c479e60 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -603,6 +603,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext1 static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext1 *iface, ID3D11Resource *resource, UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_resource; struct wined3d_map_desc map_desc; HRESULT hr; @@ -616,7 +617,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); - hr = wined3d_resource_map(wined3d_resource, subresource_idx, + hr = wined3d_device_context_map(context->wined3d_context, wined3d_resource, subresource_idx, &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); wined3d_mutex_unlock();

1 0

Piotr Caban : winemac.drv: Fix setting DISPLAY_DEVICE_ATTACHED_TO_DESKTOP flag on adapters.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 1c1c78b2c6bafc3175f0c10ded8afc416a6e08c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c1c78b2c6bafc3175f0c10d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 13 13:41:11 2021 +0200 winemac.drv: Fix setting DISPLAY_DEVICE_ATTACHED_TO_DESKTOP flag on adapters. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 3bb1b5151d5..f64a6c0f6ad 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -575,6 +575,7 @@ int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** new_adapters, i if (gpu.id == gpu_id || (gpu_id == dedicated_gpu_id && gpu.id == integrated_gpu_id)) { adapters[adapter_count].id = display_ids[i]; + adapters[adapter_count].state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; if (CGDisplayIsMain(display_ids[i])) { @@ -582,9 +583,6 @@ int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** new_adapters, i primary_index = adapter_count; } - if (CGDisplayIsActive(display_ids[i])) - adapters[adapter_count].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; - adapter_count++; } }

1 0

Nikolay Sivov : mfplay: Set media item pointer for state change events.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: wine Branch: master Commit: 85e91d19bce337d29ec0e691e24e136087efdd5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=85e91d19bce337d29ec0e691… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:29 2021 +0300 mfplay: Set media item pointer for state change events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 7360042ee54..2f868ce3b61 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1415,8 +1415,9 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba media_player_set_state(player, state); media_event_create(player, event_type, event_status, &event); LeaveCriticalSection(&player->cs); - - /* FIXME: set pMediaItem */ + event->u.generic.item = item; + if (event->u.generic.item) + IMFPMediaItem_AddRef(event->u.generic.item); media_player_queue_event(player, event); break;

1 0