August 2023 - Wine-Commits - list.winehq.org

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

Alex Henrie : shell32: Combine the two strdupAtoW functions.
by Alexandre Julliard Aug. 18, 2023

Aug. 18, 2023

Module: wine Branch: master Commit: aa8e2a16431d3a02500eb6f7447063d88f88d2b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa8e2a16431d3a02500eb6f7447063… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 17 22:33:59 2023 -0600 shell32: Combine the two strdupAtoW functions. --- dlls/shell32/shell32_main.c | 2 +- dlls/shell32/shell32_main.h | 2 +- dlls/shell32/shelllink.c | 26 +++++++------------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 2aac022f9e4..b7ff433bccb 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -585,7 +585,7 @@ HICON WINAPI ExtractIconA(HINSTANCE hInstance, const char *file, UINT nIconIndex fileW = strdupAtoW(file); ret = ExtractIconW(hInstance, fileW, nIconIndex); - heap_free(fileW); + free(fileW); return ret; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 5571da9f632..3f94385a60f 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -239,7 +239,7 @@ static inline WCHAR *strdupAtoW(const char *str) if (!str) return NULL; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = heap_alloc(len * sizeof(WCHAR)); + ret = malloc(len * sizeof(WCHAR)); if (ret) MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 24819fb90fb..df68f5a14c2 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -202,17 +202,6 @@ static inline IShellLinkImpl *impl_from_IPropertyStore(IPropertyStore *iface) static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); -/* strdup on the process heap */ -static inline LPWSTR heap_strdupAtoW( LPCSTR str) -{ - INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - WCHAR *p = malloc( len * sizeof(WCHAR) ); - if( !p ) - return p; - MultiByteToWideChar( CP_ACP, 0, str, -1, p, len ); - return p; -} - /************************************************************************** * IPersistFile_QueryInterface */ @@ -1342,7 +1331,7 @@ static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA *iface, LPCSTR ps if (pszName) { - descrW = heap_strdupAtoW(pszName); + descrW = strdupAtoW(pszName); if (!descrW) return E_OUTOFMEMORY; } else @@ -1378,7 +1367,7 @@ static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA *iface, LPCS TRACE("(%p)->(dir=%s)\n",This, pszDir); - dirW = heap_strdupAtoW(pszDir); + dirW = strdupAtoW(pszDir); if (!dirW) return E_OUTOFMEMORY; hr = IShellLinkW_SetWorkingDirectory(&This->IShellLinkW_iface, dirW); @@ -1412,7 +1401,7 @@ static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA *iface, LPCSTR pszA if (pszArgs) { - argsW = heap_strdupAtoW(pszArgs); + argsW = strdupAtoW(pszArgs); if (!argsW) return E_OUTOFMEMORY; } else @@ -1475,7 +1464,7 @@ static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA *iface, LPCSTR p if (path) { - pathW = heap_strdupAtoW(path); + pathW = strdupAtoW(path); if (!pathW) return E_OUTOFMEMORY; } @@ -1495,7 +1484,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA *iface, LPCSTR p TRACE("(%p)->(path=%s %lx)\n",This, pszPathRel, dwReserved); - pathW = heap_strdupAtoW(pszPathRel); + pathW = strdupAtoW(pszPathRel); if (!pathW) return E_OUTOFMEMORY; hr = IShellLinkW_SetRelativePath(&This->IShellLinkW_iface, pathW, dwReserved); @@ -1523,9 +1512,8 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA *iface, LPCSTR pszFile) if (!pszFile) return E_INVALIDARG; - str = heap_strdupAtoW(pszFile); - if( !str ) - return E_OUTOFMEMORY; + str = strdupAtoW(pszFile); + if (!str) return E_OUTOFMEMORY; r = IShellLinkW_SetPath(&This->IShellLinkW_iface, str); free( str );

1 0

Alexandre Julliard : ntdll/tests: Add some more tests for the contents of the WOW64INFO structure.
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: 572cc841a60a5cc0219b8dbf7cb614a0ee6f3456 URL: https://gitlab.winehq.org/wine/wine/-/commit/572cc841a60a5cc0219b8dbf7cb614… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 17 13:54:02 2023 +0200 ntdll/tests: Add some more tests for the contents of the WOW64INFO structure. --- dlls/ntdll/tests/wow64.c | 22 ++++++++++++++++++++++ include/winternl.h | 16 +++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 300494849b9..0689e7a530a 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -414,6 +414,28 @@ static void test_peb_teb(void) } ok( i < limit, "wow64info not found in PEB\n" ); } + if (wow64info->SectionHandle && wow64info->CrossProcessWorkList) + { + HANDLE handle; + void *data, *addr = NULL; + SIZE_T size = 0; + + ret = DuplicateHandle( pi.hProcess, (HANDLE)(ULONG_PTR)wow64info->SectionHandle, + GetCurrentProcess(), &handle, 0, FALSE, DUPLICATE_SAME_ACCESS ); + ok( ret, "DuplicateHandle failed %lu\n", GetLastError() ); + status = NtMapViewOfSection( handle, GetCurrentProcess(), &addr, 0, 0, NULL, + &size, ViewShare, 0, PAGE_READWRITE ); + ok( !status, "NtMapViewOfSection failed %lx\n", status ); + data = malloc( size ); + ret = ReadProcessMemory( pi.hProcess, (void *)(ULONG_PTR)wow64info->CrossProcessWorkList, + data, size, &size ); + ok( ret, "ReadProcessMemory failed %lu\n", GetLastError() ); + ok( !memcmp( data, addr, size ), "wrong data\n" ); + free( data ); + UnmapViewOfFile( addr ); + CloseHandle( handle ); + } + else trace( "no WOW64INFO section handle\n" ); } else win_skip( "RtlWow64GetSharedInfoProcess not supported\n" ); diff --git a/include/winternl.h b/include/winternl.h index 62ccdd6c95a..4b58d481603 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4103,14 +4103,16 @@ typedef struct _WOW64_CPU_AREA_INFO typedef struct _WOW64INFO { - ULONG NativeSystemPageSize; - ULONG CpuFlags; - ULONG Wow64ExecuteFlags; - ULONG unknown[5]; - USHORT NativeMachineType; - USHORT EmulatedMachineType; - ULONG unknown2; + ULONG NativeSystemPageSize; + ULONG CpuFlags; + ULONG Wow64ExecuteFlags; + ULONG unknown; + ULONGLONG SectionHandle; + ULONGLONG CrossProcessWorkList; + USHORT NativeMachineType; + USHORT EmulatedMachineType; } WOW64INFO; +C_ASSERT( sizeof(WOW64INFO) == 40 ); #define WOW64_CPUFLAGS_MSFT64 0x01 #define WOW64_CPUFLAGS_SOFTWARE 0x02

1 0

Nikolay Sivov : mf: Implement MFCreateSequencerSegmentOffset().
by Alexandre Julliard Aug. 17, 2023

Aug. 17, 2023

Module: wine Branch: master Commit: 42811d775b1a299f1dddcbbae4a2b80cb1b77698 URL: https://gitlab.winehq.org/wine/wine/-/commit/42811d775b1a299f1dddcbbae4a2b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 17 10:42:47 2023 +0200 mf: Implement MFCreateSequencerSegmentOffset(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 17 ++++++++++++ dlls/mf/topology.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index e207ca23a8e..9477cdda61e 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -56,7 +56,7 @@ @ stdcall MFCreateSampleCopierMFT(ptr) @ stdcall MFCreateSampleGrabberSinkActivate(ptr ptr ptr) @ stub MFCreateSecureHttpSchemePlugin -@ stub MFCreateSequencerSegmentOffset +@ stdcall MFCreateSequencerSegmentOffset(long int64 ptr) @ stdcall MFCreateSequencerSource(ptr ptr) @ stub MFCreateSequencerSourceRemoteStream @ stdcall MFCreateSimpleTypeHandler(ptr) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 743946f7fba..4f4a282a9d8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -7051,6 +7051,22 @@ static void test_mpeg4_media_sink(void) IMFMediaType_Release(audio_type); } +static void test_MFCreateSequencerSegmentOffset(void) +{ + PROPVARIANT propvar; + HRESULT hr; + + hr = MFCreateSequencerSegmentOffset(0, 0, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + propvar.vt = VT_EMPTY; + hr = MFCreateSequencerSegmentOffset(0, 0, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == VT_UNKNOWN, "Unexpected type %d.\n", propvar.vt); + ok(!!propvar.punkVal, "Unexpected pointer.\n"); + PropVariantClear(&propvar); +} + START_TEST(mf) { init_functions(); @@ -7085,4 +7101,5 @@ START_TEST(mf) test_MFGetTopoNodeCurrentType(); test_MFRequireProtectedEnvironment(); test_mpeg4_media_sink(); + test_MFCreateSequencerSegmentOffset(); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index b684b17ff72..f09a9c87a46 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2230,3 +2230,79 @@ HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource ** return S_OK; } + +struct segment_offset +{ + IUnknown IUnknown_iface; + LONG refcount; + MFSequencerElementId id; + MFTIME timeoffset; +}; + +static inline struct segment_offset *impl_offset_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct segment_offset, IUnknown_iface); +} + +static HRESULT WINAPI segment_offset_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI segment_offset_AddRef(IUnknown *iface) +{ + struct segment_offset *offset = impl_offset_from_IUnknown(iface); + return InterlockedIncrement(&offset->refcount); +} + +static ULONG WINAPI segment_offset_Release(IUnknown *iface) +{ + struct segment_offset *offset = impl_offset_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&offset->refcount); + + if (!refcount) + free(offset); + + return refcount; +} + +static const IUnknownVtbl segment_offset_vtbl = +{ + segment_offset_QueryInterface, + segment_offset_AddRef, + segment_offset_Release, +}; + +/*********************************************************************** + * MFCreateSequencerSegmentOffset (mf.@) + */ +HRESULT WINAPI MFCreateSequencerSegmentOffset(MFSequencerElementId id, MFTIME timeoffset, PROPVARIANT *ret) +{ + struct segment_offset *offset; + + TRACE("%#lx, %s, %p.\n", id, debugstr_time(timeoffset), ret); + + if (!ret) + return E_POINTER; + + if (!(offset = calloc(1, sizeof(*offset)))) + return E_OUTOFMEMORY; + + offset->IUnknown_iface.lpVtbl = &segment_offset_vtbl; + offset->refcount = 1; + offset->id = id; + offset->timeoffset = timeoffset; + + V_VT(ret) = VT_UNKNOWN; + V_UNKNOWN(ret) = &offset->IUnknown_iface; + + return S_OK; +} diff --git a/include/mfidl.idl b/include/mfidl.idl index 94bf1a2036c..b3201b12d84 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -709,6 +709,7 @@ cpp_quote("HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handle cpp_quote("HRESULT WINAPI MFCreateSampleCopierMFT(IMFTransform **transform);") cpp_quote("HRESULT WINAPI MFCreateSampleGrabberSinkActivate(IMFMediaType *media_type,") cpp_quote(" IMFSampleGrabberSinkCallback *callback, IMFActivate **activate);") +cpp_quote("HRESULT WINAPI MFCreateSequencerSegmentOffset(MFSequencerElementId id, MFTIME offset, PROPVARIANT *segment_offset);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager);")

1 0