- Wine-Commits - list.winehq.org

Tim Clem : ntdll: Add error and warning logs in more cases of memory exhaustion.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: 9d6aabb202a080970a50f52a7e8bfebbea6fb562 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d6aabb202a080970a50f52a7e8bfe… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Aug 17 10:26:23 2023 -0700 ntdll: Add error and warning logs in more cases of memory exhaustion. --- dlls/ntdll/unix/virtual.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 897c92b6349..078fe1c30a9 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1010,7 +1010,10 @@ static BOOL alloc_pages_vprot( const void *addr, size_t size ) { if (pages_vprot[i]) continue; if ((ptr = anon_mmap_alloc( pages_vprot_mask + 1, PROT_READ | PROT_WRITE )) == MAP_FAILED) + { + ERR( "anon mmap error %s for vprot table, size %08lx\n", strerror(errno), pages_vprot_mask + 1 ); return FALSE; + } pages_vprot[i] = ptr; } #endif @@ -1355,7 +1358,10 @@ static void *map_free_area( void *base, void *end, size_t size, int top_down, in } if (!first) - return try_map_free_area( base, end, step, start, size, unix_prot ); + start = try_map_free_area( base, end, step, start, size, unix_prot ); + + if (!start) + ERR( "couldn't map free area in range %p-%p, size %p", base, end, (void *)size ); return start; } @@ -1949,9 +1955,18 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) return STATUS_SUCCESS; failed: - if (errno == ENOMEM) status = STATUS_NO_MEMORY; + if (errno == ENOMEM) + { + ERR( "out of memory for %p-%p\n", base, (char *)base + size ); + status = STATUS_NO_MEMORY; + } else if (errno == EEXIST) status = STATUS_CONFLICTING_ADDRESSES; - else status = STATUS_INVALID_PARAMETER; + else + { + ERR( "mmap error %s for %p-%p, unix_prot %#x\n", + strerror(errno), base, (char *)base + size, unix_prot ); + status = STATUS_INVALID_PARAMETER; + } unmap_area( base, start - (char *)base ); return status; } @@ -2028,8 +2043,10 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { if ((ptr = anon_mmap_alloc( view_size, get_unix_prot(vprot) )) == MAP_FAILED) { - if (errno == ENOMEM) return STATUS_NO_MEMORY; - return STATUS_INVALID_PARAMETER; + status = (errno == ENOMEM) ? STATUS_NO_MEMORY : STATUS_INVALID_PARAMETER; + ERR( "anon mmap error %s, size %p, unix_prot %#x\n", + strerror(errno), (void *)view_size, get_unix_prot( vprot ) ); + return status; } TRACE( "got mem with anon mmap %p-%p\n", ptr, (char *)ptr + size ); /* if we got something beyond the user limit, unmap it and retry */ @@ -2098,13 +2115,20 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start if (prot & PROT_EXEC) WARN( "failed to set PROT_EXEC on file map, noexec filesystem?\n" ); break; default: + ERR( "mmap error %s, range %p-%p, unix_prot %#x\n", + strerror(errno), (char *)view->base + start, (char *)view->base + start + size, prot ); return STATUS_NO_MEMORY; } } /* Reserve the memory with an anonymous mmap */ ptr = anon_mmap_fixed( (char *)view->base + start, size, PROT_READ | PROT_WRITE, 0 ); - if (ptr == MAP_FAILED) return STATUS_NO_MEMORY; + if (ptr == MAP_FAILED) + { + ERR( "anon mmap error %s, range %p-%p\n", + strerror(errno), (char *)view->base + start, (char *)view->base + start + size ); + return STATUS_NO_MEMORY; + } /* Now read in the file */ pread( fd, ptr, size, offset ); if (prot != (PROT_READ|PROT_WRITE)) mprotect( ptr, size, prot ); /* Set the right protection */ @@ -2407,6 +2431,7 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) WARN( "file system doesn't support mmap, falling back to read\n" ); break; default: + ERR( "mmap error %s, range %p-%p\n", strerror(errno), ptr, (char *)ptr + size ); return STATUS_NO_MEMORY; } *removable = TRUE; @@ -4282,6 +4307,9 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ *ret = base; *size_ptr = size; } + else if (status == STATUS_NO_MEMORY) + ERR( "out of memory for allocation, base %p size %08lx\n", base, size ); + return status; } @@ -4328,6 +4356,11 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z *ret = wine_server_get_ptr( result.virtual_alloc.addr ); *size_ptr = result.virtual_alloc.size; } + else + { + WARN( "cross-process allocation failed, process=%p base=%p size=%08lx status=%08x", + process, *ret, *size_ptr, result.virtual_alloc.status ); + } return result.virtual_alloc.status; }

1 0

Stefan Dösinger : wined3d: Move zero swapchain parameter fixup to wined3d_swapchain_state_init.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: 77fb8e04e4c415960df04db58438154649ed76d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/77fb8e04e4c415960df04db5843815… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 8 15:32:06 2023 +0300 wined3d: Move zero swapchain parameter fixup to wined3d_swapchain_state_init. --- dlls/wined3d/swapchain.c | 51 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 85088f7b3ea..30930bc17b6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1400,7 +1400,31 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat return hr; } - if (!desc->windowed) + if (state->desc.windowed) + { + RECT client_rect; + + GetClientRect(window, &client_rect); + TRACE("Client rect %s.\n", wine_dbgstr_rect(&client_rect)); + + if (!state->desc.backbuffer_width) + { + state->desc.backbuffer_width = client_rect.right ? client_rect.right : 8; + TRACE("Updating width to %u.\n", state->desc.backbuffer_width); + } + if (!state->desc.backbuffer_height) + { + state->desc.backbuffer_height = client_rect.bottom ? client_rect.bottom : 8; + TRACE("Updating height to %u.\n", state->desc.backbuffer_height); + } + + if (state->desc.backbuffer_format == WINED3DFMT_UNKNOWN) + { + state->desc.backbuffer_format = state->original_mode.format_id; + TRACE("Updating format to %s.\n", debug_d3dformat(state->original_mode.format_id)); + } + } + else { if (desc->flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -1487,7 +1511,6 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc struct wined3d_output_desc output_desc; BOOL displaymode_set = FALSE; HRESULT hr = E_FAIL; - RECT client_rect; unsigned int i; HWND window; @@ -1523,29 +1546,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc swapchain->swap_interval = WINED3D_SWAP_INTERVAL_DEFAULT; swapchain_set_max_frame_latency(swapchain, device); - GetClientRect(window, &client_rect); - if (swapchain->state.desc.windowed) - { - TRACE("Client rect %s.\n", wine_dbgstr_rect(&client_rect)); - - if (!swapchain->state.desc.backbuffer_width) - { - swapchain->state.desc.backbuffer_width = client_rect.right ? client_rect.right : 8; - TRACE("Updating width to %u.\n", swapchain->state.desc.backbuffer_width); - } - if (!desc->backbuffer_height) - { - swapchain->state.desc.backbuffer_height = client_rect.bottom ? client_rect.bottom : 8; - TRACE("Updating height to %u.\n", swapchain->state.desc.backbuffer_height); - } - - if (swapchain->state.desc.backbuffer_format == WINED3DFMT_UNKNOWN) - { - swapchain->state.desc.backbuffer_format = swapchain->state.original_mode.format_id; - TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->state.original_mode.format_id)); - } - } - else + if (!swapchain->state.desc.windowed) { if (FAILED(hr = wined3d_output_get_desc(desc->output, &output_desc))) {

1 0

Stefan Dösinger : dxgi/tests: Test swapchains with zero dimensions.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: ab6c51f28a34a9f37d8f20453d66f883e2d7b5bd URL: https://gitlab.winehq.org/wine/wine/-/commit/ab6c51f28a34a9f37d8f20453d66f8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 4 15:37:20 2023 +0300 dxgi/tests: Test swapchains with zero dimensions. --- dlls/dxgi/tests/dxgi.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 020c6485d50..5b007d8a626 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7886,6 +7886,75 @@ done: ok(!refcount, "Device has %lu references left.\n", refcount); } +static void test_zero_size(IUnknown *device, BOOL is_d3d12) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + unsigned int i, expected; + IDXGIFactory *factory; + HWND window; + HRESULT hr; + RECT r; + + static const struct + { + INT w, h; + } + tests[] = + { + {0, 0}, + {200, 0}, + {0, 200}, + {200, 200}, + /* FIXME: How to create a window with a client rect width or height above 0 but less than 8? + * If I try to AdjustWindowRect a (100,100)-(104,104) rectangle I get a larger window. I + * suspect the decoration style and DPI will play into it too. The size below creates a + * 176x4 client rect on my system. */ + {100, 60} + }; + + get_factory(device, is_d3d12, &factory); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + window = CreateWindowA("static", "dxgi_test", WS_VISIBLE, 0, 0, tests[i].w, tests[i].h, 0, 0, 0, 0); + swapchain_desc.BufferDesc.Width = 0; + swapchain_desc.BufferDesc.Height = 0; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; + swapchain_desc.OutputWindow = window; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!swapchain_desc.BufferDesc.Width && !swapchain_desc.BufferDesc.Height, "Input desc was modified.\n"); + + hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + GetClientRect(swapchain_desc.OutputWindow, &r); + expected = r.right > 0 ? r.right : 8; + ok(swapchain_desc.BufferDesc.Width == expected, "Got width %u, expected %u, test %u.\n", + swapchain_desc.BufferDesc.Width, expected, i); + expected = r.bottom > 0 ? r.bottom : 8; + ok(swapchain_desc.BufferDesc.Height == expected, "Got height %u, expected %u, test %u.\n", + swapchain_desc.BufferDesc.Height, expected, i); + + IDXGISwapChain_Release(swapchain); + DestroyWindow(window); + } + + IDXGIFactory_Release(factory); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -8010,6 +8079,7 @@ START_TEST(dxgi) run_on_d3d10(test_swapchain_present_count); run_on_d3d10(test_resize_target_wndproc); run_on_d3d10(test_swapchain_window_messages); + run_on_d3d10(test_zero_size); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -8043,6 +8113,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_present_count); run_on_d3d12(test_resize_target_wndproc); run_on_d3d12(test_swapchain_window_messages); + run_on_d3d12(test_zero_size); FreeLibrary(d3d12_module); }

1 0

Stefan Dösinger : wined3d: Make wined3d_swapchain_desc in wined3d_swapchain_create const.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: 215a32d643af4a8e25d4f28c5bec76f6e69dca22 URL: https://gitlab.winehq.org/wine/wine/-/commit/215a32d643af4a8e25d4f28c5bec76… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 10 20:39:35 2023 +0300 wined3d: Make wined3d_swapchain_desc in wined3d_swapchain_create const. --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/swapchain.c | 36 ++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 6 +++--- dlls/wined3d/wined3d_vk.h | 2 +- include/wine/wined3d.h | 2 +- 7 files changed, 24 insertions(+), 28 deletions(-)

1 0

Stefan Dösinger : dxgi: Read back the swapchain size assigned by wined3d.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: eba2523ac1de177f6a3fc09111a4a65fad4e63ac URL: https://gitlab.winehq.org/wine/wine/-/commit/eba2523ac1de177f6a3fc09111a4a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 10 18:57:27 2023 +0300 dxgi: Read back the swapchain size assigned by wined3d. --- dlls/dxgi/swapchain.c | 9 ++++++--- dlls/wined3d/swapchain.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index d567056062e..1bb99ef4233 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -873,6 +873,7 @@ static HRESULT d3d11_swapchain_create_d3d11_textures(struct d3d11_swapchain *swa HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { + struct wined3d_swapchain_state *state; BOOL fullscreen; HRESULT hr; @@ -907,6 +908,9 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } + state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); + wined3d_swapchain_state_get_size(state, &desc->backbuffer_width, &desc->backbuffer_height); + if (FAILED(hr = d3d11_swapchain_create_d3d11_textures(swapchain, &device->IWineDXGIDevice_iface, desc))) { ERR("Failed to create d3d11 textures, hr %#lx.\n", hr); @@ -916,10 +920,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi swapchain->target = NULL; if (fullscreen) { - struct wined3d_swapchain_state *state; - desc->windowed = FALSE; - state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(&swapchain->IDXGISwapChain1_iface, &swapchain->target))) @@ -3130,6 +3131,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } + wined3d_swapchain_state_get_size(swapchain->state, &swapchain->desc.Width, &swapchain->desc.Height); + if (fullscreen) { wined3d_desc.windowed = FALSE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f8179e2a70d..274f0d40eef 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2427,6 +2427,15 @@ BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_st return state->desc.windowed; } +void CDECL wined3d_swapchain_state_get_size(const struct wined3d_swapchain_state *state, + unsigned int *width, unsigned int *height) +{ + TRACE("state %p.\n", state); + + *width = state->desc.backbuffer_width; + *height = state->desc.backbuffer_height; +} + void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { wined3d_swapchain_state_cleanup(state); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 39a0dd3a299..3094fac6f3c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -292,6 +292,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) +@ cdecl wined3d_swapchain_state_get_size(ptr ptr ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2317dc17078..230eb1a8744 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2854,6 +2854,8 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state_parent *state_parent, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); +void __cdecl wined3d_swapchain_state_get_size(const struct wined3d_swapchain_state *state, + unsigned int *width, unsigned int *height); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, const struct wined3d_display_mode *mode);

1 0

Billy Laws : wow64: Add BT module thread termination callback.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: 3ff81e3a410c59a01227f30877b36b73a0350846 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ff81e3a410c59a01227f30877b36b… Author: Billy Laws <blaws05(a)gmail.com> Date: Fri Jul 28 13:04:22 2023 -0700 wow64: Add BT module thread termination callback. --- dlls/wow64/process.c | 2 ++ dlls/wow64/syscall.c | 2 ++ dlls/wow64/wow64_private.h | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 8b41bbc84ba..2b6674ccf1b 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1039,5 +1039,7 @@ NTSTATUS WINAPI wow64_NtTerminateThread( UINT *args ) HANDLE handle = get_handle( &args ); LONG exit_code = get_ulong( &args ); + if (pBTCpuThreadTerm) pBTCpuThreadTerm( handle ); + return NtTerminateThread( handle, exit_code ); } diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index e741654a056..6b1da0913a9 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -119,6 +119,7 @@ void (WINAPI *pBTCpuNotifyMemoryFree)( void *, SIZE_T ) = NULL; void (WINAPI *pBTCpuNotifyMemoryProtect)( void *, SIZE_T, ULONG ) = NULL; void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void * ) = NULL; void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) = NULL; +void (WINAPI *pBTCpuThreadTerm)( HANDLE ) = NULL; void *dummy = RtlUnwind; @@ -913,6 +914,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuNotifyMemoryProtect ); GET_PTR( BTCpuNotifyUnmapViewOfSection ); GET_PTR( BTCpuUpdateProcessorInformation ); + GET_PTR( BTCpuThreadTerm ); GET_PTR( __wine_get_unix_opcode ); module = load_64bit_module( L"wow64win.dll" ); diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 73a100cba32..5b09d16c9d9 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -47,6 +47,7 @@ extern void (WINAPI *pBTCpuNotifyMemoryFree)( void *, SIZE_T ); extern void (WINAPI *pBTCpuNotifyMemoryProtect)( void *, SIZE_T, ULONG ); extern void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void * ); extern void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ); +extern void (WINAPI *pBTCpuThreadTerm)( HANDLE ); struct object_attr64 {

1 0

James Beddek : mshtml: Check for non-NULL plugin host before trying to hold ref.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: 2846111765350def595de6e9d54bc33d250e808b URL: https://gitlab.winehq.org/wine/wine/-/commit/2846111765350def595de6e9d54bc3… Author: James Beddek <telans(a)posteo.de> Date: Fri Aug 18 22:40:33 2023 +1200 mshtml: Check for non-NULL plugin host before trying to hold ref. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55457 Signed-off-by: James Beddek <telans(a)posteo.de> --- dlls/mshtml/npplugin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 6dfb65c0a6e..309e4e0e04e 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -301,7 +301,8 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I } instance->pdata = container->plugin_host; - IOleClientSite_AddRef(&container->plugin_host->IOleClientSite_iface); + if(container->plugin_host) + IOleClientSite_AddRef(&container->plugin_host->IOleClientSite_iface); node_release(&container->element.node); return err;

1 0

Alex Henrie : wldap32: Map LDAP_OPT_AUTO_RECONNECT to LDAP_OPT_RESTART and add tests.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: 65e2c3844b81e421bbd79aa389b43590b428898d URL: https://gitlab.winehq.org/wine/wine/-/commit/65e2c3844b81e421bbd79aa389b435… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 17 09:18:56 2023 -0600 wldap32: Map LDAP_OPT_AUTO_RECONNECT to LDAP_OPT_RESTART and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55450 --- dlls/wldap32/option.c | 29 +++++++++++++++++++++++++---- dlls/wldap32/tests/parse.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index c3e17f81b47..99c1fd0378d 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -92,6 +92,7 @@ ULONG CDECL ldap_get_optionA( LDAP *ld, int option, void *value ) return WLDAP32_LDAP_SUCCESS; } + case WLDAP32_LDAP_OPT_AUTO_RECONNECT: case WLDAP32_LDAP_OPT_DEREF: case WLDAP32_LDAP_OPT_DESC: case WLDAP32_LDAP_OPT_ERROR_NUMBER: @@ -115,7 +116,6 @@ ULONG CDECL ldap_get_optionA( LDAP *ld, int option, void *value ) return WLDAP32_LDAP_LOCAL_ERROR; case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE: - case WLDAP32_LDAP_OPT_AUTO_RECONNECT: case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE: case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME: case WLDAP32_LDAP_OPT_ENCRYPT: @@ -218,6 +218,13 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value ) return WLDAP32_LDAP_SUCCESS; } + case WLDAP32_LDAP_OPT_AUTO_RECONNECT: + { + BOOL *on = value; + ret = map_error( ldap_get_option( CTX(ld), LDAP_OPT_RESTART, value ) ); + if (!ret) *on = !!*on; + return ret; + } case WLDAP32_LDAP_OPT_DEREF: case WLDAP32_LDAP_OPT_DESC: @@ -242,7 +249,6 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value ) return WLDAP32_LDAP_LOCAL_ERROR; case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE: - case WLDAP32_LDAP_OPT_AUTO_RECONNECT: case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE: case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME: case WLDAP32_LDAP_OPT_ENCRYPT: @@ -300,6 +306,7 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) controlarrayfreeW( ctrlsW ); return ret; } + case WLDAP32_LDAP_OPT_AUTO_RECONNECT: case WLDAP32_LDAP_OPT_DEREF: case WLDAP32_LDAP_OPT_DESC: case WLDAP32_LDAP_OPT_ERROR_NUMBER: @@ -327,7 +334,6 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) return WLDAP32_LDAP_UNWILLING_TO_PERFORM; case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE: - case WLDAP32_LDAP_OPT_AUTO_RECONNECT: case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE: case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME: case WLDAP32_LDAP_OPT_ENCRYPT: @@ -473,6 +479,22 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) return map_error( ldap_set_option( CTX(ld), option, value ) ); } + case WLDAP32_LDAP_OPT_AUTO_RECONNECT: + { + if (value == WLDAP32_LDAP_OPT_ON) + value = LDAP_OPT_ON; + else if (value == WLDAP32_LDAP_OPT_OFF) + value = LDAP_OPT_OFF; + else if (*(ULONG *)value == 1) + value = LDAP_OPT_ON; + else if (*(ULONG *)value == 0) + value = LDAP_OPT_OFF; + else + return WLDAP32_LDAP_PARAM_ERROR; + + return map_error( ldap_set_option( CTX(ld), LDAP_OPT_RESTART, value ) ); + } + case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT: return map_error( ldap_set_option( CTX(ld), LDAP_OPT_REFHOPLIMIT, value ) ); @@ -533,7 +555,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) return WLDAP32_LDAP_UNWILLING_TO_PERFORM; case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE: - case WLDAP32_LDAP_OPT_AUTO_RECONNECT: case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE: case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME: case WLDAP32_LDAP_OPT_ENCRYPT: diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 995297cce10..573ab172ebf 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -593,6 +593,45 @@ static void test_opt_server_certificate(void) ldap_unbind( ld ); } +static void test_opt_auto_reconnect(void) +{ + LDAP *ld; + ULONG ret, value; + + ld = ldap_initA( (char *)"db.debian.org", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + + ret = ldap_set_optionA( ld, LDAP_OPT_AUTO_RECONNECT, LDAP_OPT_ON ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_get_optionA( ld, LDAP_OPT_AUTO_RECONNECT, &value ); + ok( !ret, "ldap_get_optionA should succeed, got %#lx\n", ret ); + ok( value == 1, "got %lu\n", ret ); + + ret = ldap_set_optionA( ld, LDAP_OPT_AUTO_RECONNECT, LDAP_OPT_OFF ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_get_optionA( ld, LDAP_OPT_AUTO_RECONNECT, &value ); + ok( !ret, "ldap_get_optionA should succeed, got %#lx\n", ret ); + ok( value == 0, "got %lu\n", ret ); + + value = 1; + ret = ldap_set_optionA( ld, LDAP_OPT_AUTO_RECONNECT, &value ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_get_optionA( ld, LDAP_OPT_AUTO_RECONNECT, &value ); + ok( !ret, "ldap_get_optionA should succeed, got %#lx\n", ret ); + ok( value == 1, "got %lu\n", ret ); + + value = 0; + ret = ldap_set_optionA( ld, LDAP_OPT_AUTO_RECONNECT, &value ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_get_optionA( ld, LDAP_OPT_AUTO_RECONNECT, &value ); + ok( !ret, "ldap_get_optionA should succeed, got %#lx\n", ret ); + ok( value == 0, "got %lu\n", ret ); + + value = 2; + ret = ldap_set_optionA( ld, LDAP_OPT_AUTO_RECONNECT, &value ); + ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionA should fail, got %#lx\n", ret ); +} + START_TEST (parse) { LDAP *ld; @@ -602,6 +641,7 @@ START_TEST (parse) test_ldap_bind_sA(); test_opt_ssl(); test_opt_server_certificate(); + test_opt_auto_reconnect(); ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" );

1 0

Alex Henrie : oledb32: Use CRT allocation functions.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: dcc049ad4c5eae2ca892cb48352010a41ea82ea4 URL: https://gitlab.winehq.org/wine/wine/-/commit/dcc049ad4c5eae2ca892cb48352010… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 17 20:56:25 2023 -0600 oledb32: Use CRT allocation functions. --- dlls/oledb32/convert.c | 5 ++--- dlls/oledb32/dslocator.c | 9 ++++----- dlls/oledb32/errorinfo.c | 11 +++++------ dlls/oledb32/tests/marshal.c | 4 ++-- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index e634db237f0..540ceac1d2d 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -31,7 +31,6 @@ #include "oledb_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); @@ -102,7 +101,7 @@ static ULONG WINAPI convert_Release(IDataConvert* iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - heap_free(This); + free(This); return ref; } @@ -1705,7 +1704,7 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) if(outer) return CLASS_E_NOAGGREGATION; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDataConvert_iface.lpVtbl = &convert_vtbl; diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 5746b51d55c..6991be65f65 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -35,7 +35,6 @@ #include "resource.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); @@ -49,7 +48,7 @@ struct datasource static struct datasource *create_datasource(WCHAR *guid) { - struct datasource *data = heap_alloc_zero(sizeof(struct datasource)); + struct datasource *data = calloc(1, sizeof(struct datasource)); if (data) { CLSIDFromString(guid, &data->clsid); @@ -75,7 +74,7 @@ static void destroy_datasource(struct datasource *data) if (data->provider) IDBProperties_Release(data->provider); - heap_free(data); + free(data); } static BOOL initialize_datasource(struct datasource *data) @@ -191,7 +190,7 @@ static ULONG WINAPI dslocator_Release(IDataSourceLocator *iface) if (!ref) { - heap_free(This); + free(This); } return ref; @@ -775,7 +774,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) if(outer) return CLASS_E_NOAGGREGATION; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDataSourceLocator_iface.lpVtbl = &DSLocatorVtbl; diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 6857caeb368..2a5d53c52ab 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -31,7 +31,6 @@ #include "oledb_private.h" -#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" @@ -124,8 +123,8 @@ static ULONG WINAPI errorrecords_Release(IErrorInfo* iface) CoTaskMemFree(dispparams->rgvarg); CoTaskMemFree(dispparams->rgdispidNamedArgs); } - heap_free(This->records); - heap_free(This); + free(This->records); + free(This); } return ref; } @@ -276,7 +275,7 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p if (!This->records) { const unsigned int initial_size = 16; - if (!(This->records = heap_alloc(initial_size * sizeof(*This->records)))) + if (!(This->records = malloc(initial_size * sizeof(*This->records)))) return E_OUTOFMEMORY; This->allocated = initial_size; @@ -285,7 +284,7 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p { struct ErrorEntry *new_ptr; - new_ptr = heap_realloc(This->records, 2 * This->allocated * sizeof(*This->records)); + new_ptr = realloc(This->records, 2 * This->allocated * sizeof(*This->records)); if (!new_ptr) return E_OUTOFMEMORY; @@ -419,7 +418,7 @@ HRESULT create_error_info(IUnknown *outer, void **obj) if(outer) return CLASS_E_NOAGGREGATION; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IErrorInfo_iface.lpVtbl = &ErrorInfoVtbl; diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 88af99a0659..758d7b50432 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -81,7 +81,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) DispatchMessageW(&msg); } - HeapFree(GetProcessHeap(), 0, data); + free(data); CoUninitialize(); @@ -92,7 +92,7 @@ static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, { DWORD tid = 0; HANDLE marshal_event = CreateEventW(NULL, FALSE, FALSE, NULL); - struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + struct host_object_data *data = malloc(sizeof(*data)); data->stream = stream; data->iid = *riid;

1 0

Alex Henrie : find: Use CRT allocation functions.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: f339506f4f7852436fe13ecba78b416c412918f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f339506f4f7852436fe13ecba78b41… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 17 21:56:54 2023 -0600 find: Use CRT allocation functions. --- programs/find/find.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/programs/find/find.c b/programs/find/find.c index 5b86325d1c2..b4eb4d1949b 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -20,7 +20,6 @@ #include <stdlib.h> #include <shlwapi.h> -#include "wine/heap.h" #include "wine/debug.h" #include "resources.h" @@ -53,7 +52,7 @@ static WCHAR* read_line_from_handle(HANDLE handle) WCHAR *line_converted; int line_converted_length; BOOL success; - char *line = heap_alloc(line_max); + char *line = malloc(line_max); for (;;) { @@ -76,7 +75,7 @@ static WCHAR* read_line_from_handle(HANDLE handle) if (length + 1 >= line_max) { line_max *= 2; - line = heap_realloc(line, line_max); + line = realloc(line, line_max); } line[length++] = c; @@ -87,10 +86,10 @@ static WCHAR* read_line_from_handle(HANDLE handle) line[length - 1] = 0; line_converted_length = MultiByteToWideChar(CP_ACP, 0, line, -1, 0, 0); - line_converted = heap_alloc(line_converted_length * sizeof(WCHAR)); + line_converted = malloc(line_converted_length * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, line, -1, line_converted, line_converted_length); - heap_free(line); + free(line); return line_converted; } @@ -104,14 +103,14 @@ static void write_to_stdout(const WCHAR *str) int codepage = CP_ACP; str_converted_length = WideCharToMultiByte(codepage, 0, str, str_length, NULL, 0, NULL, NULL); - str_converted = heap_alloc(str_converted_length); + str_converted = malloc(str_converted_length); WideCharToMultiByte(codepage, 0, str, str_length, str_converted, str_converted_length, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), str_converted, str_converted_length, &bytes_written, NULL); if (bytes_written < str_converted_length) ERR("Failed to write output\n"); - heap_free(str_converted); + free(str_converted); } static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) @@ -173,7 +172,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (file_paths_len >= file_paths_max) { file_paths_max = file_paths_max ? file_paths_max * 2 : 2; - file_paths = heap_realloc(file_paths, sizeof(WCHAR*) * file_paths_max); + file_paths = realloc(file_paths, sizeof(WCHAR*) * file_paths_max); } file_paths[file_paths_len++] = argv[i]; } @@ -219,7 +218,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (run_find_for_line(line, tofind)) exitcode = 0; - heap_free(line); + free(line); } CloseHandle(input); } @@ -232,10 +231,10 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (run_find_for_line(line, tofind)) exitcode = 0; - heap_free(line); + free(line); } } - heap_free(file_paths); + free(file_paths); return exitcode; }

1 0