wine-commits June 2023

wine-commits@winehq.org

1 participants
633 discussions

Giovanni Mascellani : dxgi: Rename and split d3d12_swapchain_destroy_buffers().
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: e0ce5e331ae57954773e9c9349d6489b0a910c47 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0ce5e331ae57954773e9c9349d648… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 30 16:11:33 2023 +0200 dxgi: Rename and split d3d12_swapchain_destroy_buffers(). --- dlls/dxgi/swapchain.c | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 480447342e4..f760e931bb1 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1579,7 +1579,7 @@ static VkResult d3d12_swapchain_acquire_next_vulkan_image(struct d3d12_swapchain return vr; } -static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) +static void d3d12_swapchain_destroy_vulkan_resources(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkQueue vk_queue; @@ -1599,34 +1599,41 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B } } + if (swapchain->vk_device) + { + for (i = 0; i < swapchain->buffer_count; ++i) + { + vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); + swapchain->vk_semaphores[i] = VK_NULL_HANDLE; + } + + vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); + swapchain->vk_cmd_pool = VK_NULL_HANDLE; + } +} + +static void d3d12_swapchain_destroy_resources(struct d3d12_swapchain *swapchain) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + unsigned int i; + + d3d12_swapchain_destroy_vulkan_resources(swapchain); + for (i = 0; i < swapchain->desc.BufferCount; ++i) { - if (swapchain->buffers[i] && destroy_user_buffers) + if (swapchain->buffers[i]) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; } - if (swapchain->vk_device && destroy_user_buffers) + if (swapchain->vk_device) { vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); swapchain->vk_images[i] = VK_NULL_HANDLE; - } - } - if (swapchain->vk_device) - { - for (i = 0; i < swapchain->buffer_count; ++i) - { - vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); - swapchain->vk_semaphores[i] = VK_NULL_HANDLE; - } - if (destroy_user_buffers) - { vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); swapchain->vk_memory = VK_NULL_HANDLE; } - vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); - swapchain->vk_cmd_pool = VK_NULL_HANDLE; } } @@ -1831,7 +1838,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; void *vulkan_module = vk_funcs->vulkan_module; - d3d12_swapchain_destroy_buffers(swapchain, TRUE); + d3d12_swapchain_destroy_resources(swapchain); if (swapchain->frame_latency_event) CloseHandle(swapchain->frame_latency_event); @@ -1966,7 +1973,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return S_OK; } - d3d12_swapchain_destroy_buffers(swapchain, FALSE); + d3d12_swapchain_destroy_vulkan_resources(swapchain); swapchain->present_mode = present_mode; return d3d12_swapchain_create_vulkan_resources(swapchain); } @@ -2074,7 +2081,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, TRACE("Recreating Vulkan swapchain.\n"); - d3d12_swapchain_destroy_buffers(swapchain, FALSE); + d3d12_swapchain_destroy_vulkan_resources(swapchain); if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain))) return hr; @@ -2352,7 +2359,7 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, && desc->Format == new_desc.Format && desc->BufferCount == new_desc.BufferCount) return S_OK; - d3d12_swapchain_destroy_buffers(swapchain, TRUE); + d3d12_swapchain_destroy_resources(swapchain); swapchain->desc = new_desc; return d3d12_swapchain_create_resources(swapchain); }

1 0

Giovanni Mascellani : dxgi: Only create D3D12 resources when necessary.
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: 2e556c32457cff9a9fbe9cd0cf2c3ba849489322 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e556c32457cff9a9fbe9cd0cf2c3b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 16:17:45 2023 +0200 dxgi: Only create D3D12 resources when necessary. --- dlls/dxgi/swapchain.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9343b149235..480447342e4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1271,9 +1271,6 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; - if (swapchain->vk_images[0]) - return S_OK; - memset(&image_info, 0, sizeof(image_info)); image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; @@ -1519,9 +1516,6 @@ static HRESULT d3d12_swapchain_create_image_resources(struct d3d12_swapchain *sw unsigned int i; HRESULT hr; - if (swapchain->buffers[0]) - return S_OK; - resource_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; resource_info.next = NULL; resource_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; @@ -1540,6 +1534,9 @@ static HRESULT d3d12_swapchain_create_image_resources(struct d3d12_swapchain *sw for (i = 0; i < swapchain->desc.BufferCount; ++i) { + assert(swapchain->vk_images[i]); + assert(!swapchain->buffers[i]); + resource_info.vk_image = swapchain->vk_images[i]; if (FAILED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i]))) @@ -1759,6 +1756,16 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return S_OK; } +static HRESULT d3d12_swapchain_create_vulkan_resources(struct d3d12_swapchain *swapchain) +{ + HRESULT hr; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + return hr; + + return d3d12_swapchain_create_command_buffers(swapchain); +} + static HRESULT d3d12_swapchain_create_resources(struct d3d12_swapchain *swapchain) { HRESULT hr; @@ -1775,10 +1782,7 @@ static HRESULT d3d12_swapchain_create_resources(struct d3d12_swapchain *swapchai if (FAILED(hr = d3d12_swapchain_create_image_resources(swapchain))) return hr; - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - return hr; - - return d3d12_swapchain_create_command_buffers(swapchain); + return d3d12_swapchain_create_vulkan_resources(swapchain); } static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain4(IDXGISwapChain4 *iface) @@ -1964,7 +1968,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha d3d12_swapchain_destroy_buffers(swapchain, FALSE); swapchain->present_mode = present_mode; - return d3d12_swapchain_create_resources(swapchain); + return d3d12_swapchain_create_vulkan_resources(swapchain); } static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) @@ -2071,7 +2075,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, TRACE("Recreating Vulkan swapchain.\n"); d3d12_swapchain_destroy_buffers(swapchain, FALSE); - if (FAILED(hr = d3d12_swapchain_create_resources(swapchain))) + if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain))) return hr; if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue)))

1 0

Giovanni Mascellani : dxgi: Do not destroy D3D12 resources unless requested.
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: c10e2721525f5c4e2e4ef71dbdfb38f7fdc77b1c URL: https://gitlab.winehq.org/wine/wine/-/commit/c10e2721525f5c4e2e4ef71dbdfb38… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 16:07:46 2023 +0200 dxgi: Do not destroy D3D12 resources unless requested. This is probably a leftover of when Vulkan swapchain images were used directly. --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 12bfa49aa05..9343b149235 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1604,7 +1604,7 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B for (i = 0; i < swapchain->desc.BufferCount; ++i) { - if (swapchain->buffers[i] && (destroy_user_buffers || !swapchain->vk_images[0])) + if (swapchain->buffers[i] && destroy_user_buffers) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL;

1 0

Giovanni Mascellani : dxgi: Remove now-useless function d3d12_swapchain_create_buffers().
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: bc3edfd1885e29f80dcf69230c82a26dcb66b3e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc3edfd1885e29f80dcf69230c82a2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 15:49:00 2023 +0200 dxgi: Remove now-useless function d3d12_swapchain_create_buffers(). --- dlls/dxgi/swapchain.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 44504794d95..12bfa49aa05 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1555,19 +1555,6 @@ static HRESULT d3d12_swapchain_create_image_resources(struct d3d12_swapchain *sw return S_OK; } -static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain) -{ - HRESULT hr; - - if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain))) - return hr; - - if (FAILED(hr = d3d12_swapchain_create_command_buffers(swapchain))) - return hr; - - return d3d12_swapchain_create_image_resources(swapchain); -} - static VkResult d3d12_swapchain_acquire_next_vulkan_image(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1782,10 +1769,16 @@ static HRESULT d3d12_swapchain_create_resources(struct d3d12_swapchain *swapchai return DXGI_ERROR_INVALID_CALL; } + if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain))) + return hr; + + if (FAILED(hr = d3d12_swapchain_create_image_resources(swapchain))) + return hr; + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) return hr; - return d3d12_swapchain_create_buffers(swapchain); + return d3d12_swapchain_create_command_buffers(swapchain); } static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain4(IDXGISwapChain4 *iface)

1 0

Giovanni Mascellani : dxgi: Do not uselessly pass queue_family_index around.
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: 0521f570278619870b7256365db6178d2c0fc65d URL: https://gitlab.winehq.org/wine/wine/-/commit/0521f570278619870b7256365db617… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 15:47:45 2023 +0200 dxgi: Do not uselessly pass queue_family_index around. --- dlls/dxgi/swapchain.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0b8d09d8b96..44504794d95 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1456,8 +1456,7 @@ static VkResult d3d12_swapchain_record_swapchain_blit(struct d3d12_swapchain *sw return vr; } -static HRESULT d3d12_swapchain_create_command_buffers(struct d3d12_swapchain *swapchain, - uint32_t queue_family_index) +static HRESULT d3d12_swapchain_create_command_buffers(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDevice vk_device = swapchain->vk_device; @@ -1470,7 +1469,7 @@ static HRESULT d3d12_swapchain_create_command_buffers(struct d3d12_swapchain *sw pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; pool_info.pNext = NULL; pool_info.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT; - pool_info.queueFamilyIndex = queue_family_index; + pool_info.queueFamilyIndex = vkd3d_get_vk_queue_family_index(swapchain->command_queue); assert(swapchain->vk_cmd_pool == VK_NULL_HANDLE); if ((vr = vk_funcs->p_vkCreateCommandPool(vk_device, &pool_info, @@ -1558,16 +1557,12 @@ static HRESULT d3d12_swapchain_create_image_resources(struct d3d12_swapchain *sw static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain) { - ID3D12CommandQueue *queue = swapchain->command_queue; - uint32_t queue_family_index; HRESULT hr; - queue_family_index = vkd3d_get_vk_queue_family_index(queue); - if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain))) return hr; - if (FAILED(hr = d3d12_swapchain_create_command_buffers(swapchain, queue_family_index))) + if (FAILED(hr = d3d12_swapchain_create_command_buffers(swapchain))) return hr; return d3d12_swapchain_create_image_resources(swapchain);

1 0

Alexandre Julliard : ntdll: Implement _errno().
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: bef61e293cc5c809be93c40760f2be97f7a70c8f URL: https://gitlab.winehq.org/wine/wine/-/commit/bef61e293cc5c809be93c40760f2be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 12:09:25 2023 +0200 ntdll: Implement _errno(). --- dlls/ntdll/loader.c | 1 + dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/tests/thread.c | 21 +++++++++++++++++++++ dlls/ntdll/thread.c | 9 +++++++++ 5 files changed, 34 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c8e85970604..fc2d2ff7a12 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4216,6 +4216,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR sizeof(peb->TlsExpansionBitmapBits) * 8 ); /* TLS index 0 is always reserved, and wow64 reserves extra TLS entries */ RtlSetBits( peb->TlsBitmap, 0, NtCurrentTeb()->WowTebOffset ? WOW64_TLS_MAX_NUMBER : 1 ); + RtlSetBits( peb->TlsBitmap, NTDLL_TLS_ERRNO, 1 ); init_user_process_params(); load_global_options(); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 80277005672..4471a5e59d4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1514,6 +1514,7 @@ @ cdecl -norelay -arch=i386 -ret64 _aullrem(int64 int64) @ cdecl -norelay -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() +@ cdecl _errno() @ stub _fltused @ cdecl -arch=i386 -ret64 _ftol() @ cdecl -arch=i386 -ret64 _ftol2() _ftol diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index f6b77b79cde..ad8e2691224 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -39,6 +39,8 @@ #define MAX_NT_PATH_LENGTH 277 +#define NTDLL_TLS_ERRNO 16 /* TLS slot for _errno() */ + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) static const UINT_PTR page_size = 0x1000; #else diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index 3086247d5f4..56fb078babc 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -24,12 +24,14 @@ static NTSTATUS (WINAPI *pNtCreateThreadEx)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, HANDLE, PRTL_THREAD_START_ROUTINE, void *, ULONG, ULONG_PTR, SIZE_T, SIZE_T, PS_ATTRIBUTE_LIST * ); +static int * (CDECL *p_errno)(void); static void init_function_pointers(void) { HMODULE hntdll = GetModuleHandleA( "ntdll.dll" ); #define GET_FUNC(name) p##name = (void *)GetProcAddress( hntdll, #name ); GET_FUNC( NtCreateThreadEx ); + GET_FUNC( _errno ); #undef GET_FUNC } @@ -177,10 +179,29 @@ static void test_unique_teb(void) ok( args1.teb != args2.teb, "Multiple threads have TEB %p.\n", args1.teb ); } +static void test_errno(void) +{ + int val; + + if (!p_errno) + { + win_skip( "_errno not available\n" ); + return; + } + ok( NtCurrentTeb()->Peb->TlsBitmap->Buffer[0] & (1 << 16), "TLS entry 16 not allocated\n" ); + *p_errno() = 0xdead; + val = PtrToLong( TlsGetValue( 16 )); + ok( val == 0xdead, "wrong value %x\n", val ); + *p_errno() = 0xbeef; + val = PtrToLong( TlsGetValue( 16 )); + ok( val == 0xbeef, "wrong value %x\n", val ); +} + START_TEST(thread) { init_function_pointers(); test_dbg_hidden_thread_creation(); test_unique_teb(); + test_errno(); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8e5c6ef47dc..15a686738ff 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -463,6 +463,15 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) } +/*********************************************************************** + * _errno (NTDLL.@) + */ +int * CDECL _errno(void) +{ + return (int *)&NtCurrentTeb()->TlsSlots[NTDLL_TLS_ERRNO]; +} + + /*********************************************************************** * Fibers ***********************************************************************/

1 0

Alexandre Julliard : wow64: Map a copy of ntdll to build the syscall table.
by Alexandre Julliard 21 Jun '23

21 Jun '23

Module: wine Branch: master Commit: 2ef4cc48fbce406d67be32a90a2208868026a505 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ef4cc48fbce406d67be32a90a2208… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 12:08:00 2023 +0200 wow64: Map a copy of ntdll to build the syscall table. The original ntdll may have been hooked. --- dlls/wow64/syscall.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 23f8915aa64..4bd4f4f2741 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -744,6 +744,46 @@ void init_image_mapping( HMODULE module ) } +/********************************************************************** + * load_32bit_module + */ +static HMODULE load_32bit_module( const WCHAR *name, WORD machine ) +{ + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + LARGE_INTEGER size; + UNICODE_STRING str; + SIZE_T len = 0; + void *ptr = NULL; + HANDLE handle, mapping; + WCHAR path[MAX_PATH]; + const WCHAR *dir = get_machine_wow64_dir( machine ); + + swprintf( path, MAX_PATH, L"%s\\%s", dir, name ); + RtlInitUnicodeString( &str, path ); + InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL ); + + status = NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ); + if (status) return NULL; + + size.QuadPart = 0; + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | + SECTION_MAP_READ | SECTION_MAP_EXECUTE, + NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); + NtClose( handle ); + if (status) return NULL; + + status = NtMapViewOfSection( mapping, NtCurrentProcess(), &ptr, 0, 0, NULL, &len, + ViewShare, 0, PAGE_EXECUTE_READ ); + NtClose( mapping ); + if (!NT_SUCCESS( status )) ptr = NULL; + return ptr; +} + + /********************************************************************** * load_64bit_module */ @@ -813,7 +853,7 @@ static const WCHAR *get_cpu_dll_name(void) static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **context ) { TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); - HMODULE module; + HMODULE module, ntdll; UNICODE_STRING str = RTL_CONSTANT_STRING( L"ntdll.dll" ); SYSTEM_BASIC_INFORMATION info; @@ -853,11 +893,17 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; init_image_mapping( module ); - init_syscall_table( module, 0, &ntdll_syscall_table ); *(void **)RtlFindExportedRoutineByName( module, "__wine_syscall_dispatcher" ) = pBTCpuGetBopCode(); *(void **)RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ) = p__wine_get_unix_opcode(); GET_PTR( KiRaiseUserExceptionDispatcher ); + if ((ntdll = load_32bit_module( L"ntdll.dll", current_machine ))) + { + init_syscall_table( ntdll, 0, &ntdll_syscall_table ); + NtUnmapViewOfSection( NtCurrentProcess(), ntdll ); + } + else init_syscall_table( module, 0, &ntdll_syscall_table ); + init_file_redirects(); return TRUE;

1 0

Alex Henrie : ws2_32: Don't export num_startup.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: 5da3827d863ae43f8367cdafbeba73cec7cdee3d URL: https://gitlab.winehq.org/wine/wine/-/commit/5da3827d863ae43f8367cdafbeba73… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 19 21:30:46 2023 -0600 ws2_32: Don't export num_startup. --- dlls/ws2_32/ws2_32_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 41d9e512488..10cb4da30aa 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -90,7 +90,7 @@ struct per_thread_data char ntoa_buffer[16]; /* 4*3 digits + 3 '.' + 1 '\0' */ }; -extern int num_startup; +extern int num_startup DECLSPEC_HIDDEN; struct per_thread_data *get_per_thread_data(void) DECLSPEC_HIDDEN;

1 0

Alex Henrie : crypt32: Don't export CRYPT_CopyReversed.
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: 8102e2ca2b521a8a026381818d2b83fb74738434 URL: https://gitlab.winehq.org/wine/wine/-/commit/8102e2ca2b521a8a026381818d2b83… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 19 21:44:05 2023 -0600 crypt32: Don't export CRYPT_CopyReversed. --- dlls/crypt32/crypt32_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index e29249b1136..d61fcfb7d6e 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -46,7 +46,7 @@ BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) /* Copies `len` bytes from `src` to `dst`, * reversing the order of the bytes */ -void CRYPT_CopyReversed(BYTE *dst, const BYTE *src, size_t len); +void CRYPT_CopyReversed(BYTE *dst, const BYTE *src, size_t len) DECLSPEC_HIDDEN; BOOL CRYPT_EncodeLen(DWORD len, BYTE *pbEncoded, DWORD *pcbEncoded) DECLSPEC_HIDDEN;

1 0

Alex Henrie : sane: Fix use after free in create_item (scan-build).
by Alexandre Julliard 20 Jun '23

20 Jun '23

Module: wine Branch: master Commit: df7ed47b02d3247795ac7bc18f918256d6d8e909 URL: https://gitlab.winehq.org/wine/wine/-/commit/df7ed47b02d3247795ac7bc18f9182… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 19 20:56:12 2023 -0600 sane: Fix use after free in create_item (scan-build). realloc may free lead_static. --- dlls/sane.ds/ui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index e66526a088e..f5ce43c086f 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -257,7 +257,7 @@ static int create_item(HDC hdc, const struct option_descriptor *opt, tpl->style=styles; tpl->dwExtendedStyle = 0; if (lead_static) - tpl->x = lead_static->x + lead_static->cx + 1; + tpl->x = rc->x + rc->cx + 1; else if (opt->type == TYPE_GROUP) tpl->x = 2; else @@ -274,7 +274,7 @@ static int create_item(HDC hdc, const struct option_descriptor *opt, else { if (lead_static) - tpl->cy = lead_static->cy; + tpl->cy = rc->cy; else tpl->cy = 15;

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2023