November 2022 - Wine-Commits

Alex Henrie : dpnet: Use standard C functions for memory allocation in address.c.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: 26be4fb92693a85415c14a5efc3193dc5b6df454 URL: https://gitlab.winehq.org/wine/wine/-/commit/26be4fb92693a85415c14a5efc3193… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 21:06:22 2022 -0700 dpnet: Use standard C functions for memory allocation in address.c. --- dlls/dpnet/address.c | 57 ++++++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index dbb5f83f453..efe3785cd8c 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -36,22 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); -static char *heap_strdupA( const char *str ) -{ - char *ret; - - if (!str) return NULL; - if ((ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ))) strcpy( ret, str ); - return ret; -} - static BOOL add_component(IDirectPlay8AddressImpl *This, struct component *item) { if(This->comp_count == This->comp_array_size) { struct component **temp; - temp = heap_realloc(This->components, sizeof(*temp) * This->comp_array_size * 2 ); + temp = realloc(This->components, sizeof(*temp) * This->comp_array_size * 2); if(!temp) { return FALSE; @@ -115,22 +106,22 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface) switch(entry->type) { case DPNA_DATATYPE_STRING: - heap_free(entry->data.string); + free(entry->data.string); break; case DPNA_DATATYPE_STRING_ANSI: - heap_free(entry->data.ansi); + free(entry->data.ansi); break; case DPNA_DATATYPE_BINARY: - heap_free(entry->data.binary); + free(entry->data.binary); break; } - heap_free(entry->name); - heap_free(entry); + free(entry->name); + free(entry); } - heap_free(This->components); - heap_free(This); + free(This->components); + free(This); } return ref; } @@ -326,7 +317,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface return DPNERR_INVALIDPOINTER; if(url && *length) - buffer = heap_alloc(*length * sizeof(WCHAR)); + buffer = malloc(*length * sizeof(WCHAR)); hr = IDirectPlay8Address_GetURLW(iface, buffer, length); if(hr == DPN_OK) @@ -341,7 +332,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface hr = DPNERR_BUFFERTOOSMALL; } } - heap_free(buffer); + free(buffer); return hr; } @@ -589,11 +580,11 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * found = TRUE; if(entry->type == DPNA_DATATYPE_STRING_ANSI) - heap_free(entry->data.ansi); + free(entry->data.ansi); else if(entry->type == DPNA_DATATYPE_STRING) - heap_free(entry->data.string); + free(entry->data.string); else if(entry->type == DPNA_DATATYPE_BINARY) - heap_free(entry->data.binary); + free(entry->data.binary); break; } @@ -602,21 +593,21 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * if(!found) { /* Create a new one */ - entry = heap_alloc(sizeof(struct component)); + entry = malloc(sizeof(struct component)); if(!entry) return E_OUTOFMEMORY; - entry->name = heap_strdupW(pwszName); + entry->name = wcsdup(pwszName); if(!entry->name) { - heap_free(entry); + free(entry); return E_OUTOFMEMORY; } if(!add_component(This, entry)) { - heap_free(entry->name); - heap_free(entry); + free(entry->name); + free(entry); return E_OUTOFMEMORY; } } @@ -632,15 +623,15 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * TRACE("(%p, %lu): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid(lpvData)); break; case DPNA_DATATYPE_STRING: - entry->data.string = heap_strdupW((WCHAR*)lpvData); + entry->data.string = wcsdup((WCHAR*)lpvData); TRACE("(%p, %lu): STRING Type -> %s\n", lpvData, dwDataSize, debugstr_w((WCHAR*)lpvData)); break; case DPNA_DATATYPE_STRING_ANSI: - entry->data.ansi = heap_strdupA((CHAR*)lpvData); + entry->data.ansi = strdup((char*)lpvData); TRACE("(%p, %lu): ANSI STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData); break; case DPNA_DATATYPE_BINARY: - entry->data.binary = heap_alloc(dwDataSize); + entry->data.binary = malloc(dwDataSize); memcpy(entry->data.binary, lpvData, dwDataSize); TRACE("(%p, %lu): BINARY Type\n", lpvData, dwDataSize); break; @@ -709,17 +700,17 @@ HRESULT DPNET_CreateDirectPlay8Address(IClassFactory *iface, IUnknown *pUnkOuter *ppobj = NULL; - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8AddressImpl)); + client = calloc(1, sizeof(IDirectPlay8AddressImpl)); if (!client) return E_OUTOFMEMORY; client->IDirectPlay8Address_iface.lpVtbl = &DirectPlay8Address_Vtbl; client->ref = 1; client->comp_array_size = 4; - client->components = heap_alloc( sizeof(*client->components) * client->comp_array_size ); + client->components = malloc(sizeof(*client->components) * client->comp_array_size); if(!client->components) { - heap_free(client); + free(client); return E_OUTOFMEMORY; }

1 0

Alex Henrie : ole32: Correct warning message in composite_get_leftmost.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: d222341f6c98c6f8c86644a91aeb572dccbb38c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d222341f6c98c6f8c86644a91aeb57… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 20:32:52 2022 -0700 ole32: Correct warning message in composite_get_leftmost. Looks like a copy-paste error. --- dlls/ole32/compositemoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 84099cee6d6..40f77459ef8 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1658,7 +1658,7 @@ static HRESULT composite_get_leftmost(CompositeMonikerImpl *composite, IMoniker if (!(node = moniker_tree_get_leftmost(root))) { - WARN("Couldn't get right most component.\n"); + WARN("Couldn't get left most component.\n"); return E_FAIL; }

1 0

Alex Henrie : comdlg32: Use standard C functions for memory allocation in printdlg.c.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: cad9446567e77cb1a3ded50bfeccc2971e3ca4ba URL: https://gitlab.winehq.org/wine/wine/-/commit/cad9446567e77cb1a3ded50bfeccc2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 20:47:42 2022 -0700 comdlg32: Use standard C functions for memory allocation in printdlg.c. The big win here is getting rid of the reimplementation of wcsdup. --- dlls/comdlg32/printdlg.c | 196 ++++++++++++++++++++++------------------------- 1 file changed, 91 insertions(+), 105 deletions(-)

1 0

Alex Henrie : sspicli: Use standard C functions for memory allocation.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: 0ba7924816aa9ea37e3196301b86c0486458dac3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ba7924816aa9ea37e3196301b86c0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 22:29:18 2022 -0700 sspicli: Use standard C functions for memory allocation. --- dlls/sspicli/main.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c index 186a6acd65b..2190fc5956a 100644 --- a/dlls/sspicli/main.c +++ b/dlls/sspicli/main.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -52,7 +53,7 @@ SECURITY_STATUS SEC_ENTRY SspiEncodeStringsAsAuthIdentity( if (username) size += (len_username + 1) * sizeof(WCHAR); if (domainname) size += (len_domainname + 1) * sizeof(WCHAR); if (creds) size += (len_password + 1) * sizeof(WCHAR); - if (!(id = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) return ERROR_OUTOFMEMORY; + if (!(id = calloc( 1, size ))) return ERROR_OUTOFMEMORY; ptr = (WCHAR *)(id + 1); if (username) @@ -96,15 +97,6 @@ void SEC_ENTRY SspiZeroAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) memset( id, 0, sizeof(*id) ); } -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if ((dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) - lstrcpyW( dst, src ); - return dst; -} - /*********************************************************************** * SspiEncodeAuthIdentityAsStrings (SECUR32.0) */ @@ -116,9 +108,9 @@ SECURITY_STATUS SEC_ENTRY SspiEncodeAuthIdentityAsStrings( FIXME("%p %p %p %p\n", opaque_id, username, domainname, creds); - *username = strdupW( id->User ); - *domainname = strdupW( id->Domain ); - *creds = strdupW( id->Password ); + *username = wcsdup( id->User ); + *domainname = wcsdup( id->Domain ); + *creds = wcsdup( id->Password ); return SEC_E_OK; } @@ -129,7 +121,7 @@ SECURITY_STATUS SEC_ENTRY SspiEncodeAuthIdentityAsStrings( void SEC_ENTRY SspiFreeAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) { TRACE( "%p\n", opaque_id ); - HeapFree( GetProcessHeap(), 0, opaque_id ); + free( opaque_id ); } /*********************************************************************** @@ -138,7 +130,7 @@ void SEC_ENTRY SspiFreeAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) void SEC_ENTRY SspiLocalFree( void *ptr ) { TRACE( "%p\n", ptr ); - HeapFree( GetProcessHeap(), 0, ptr ); + free( ptr ); } /*********************************************************************** @@ -158,7 +150,7 @@ SECURITY_STATUS SEC_ENTRY SspiPrepareForCredWrite( PSEC_WINNT_AUTH_IDENTITY_OPAQ if (id->DomainLength) { len = (id->DomainLength + id->UserLength + 2) * sizeof(WCHAR); - if (!(str = HeapAlloc(GetProcessHeap(), 0 , len ))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(str = malloc( len ))) return SEC_E_INSUFFICIENT_MEMORY; memcpy( str, id->Domain, id->DomainLength * sizeof(WCHAR) ); str[id->DomainLength] = '\\'; memcpy( str + id->DomainLength + 1, id->User, id->UserLength * sizeof(WCHAR) ); @@ -167,23 +159,23 @@ SECURITY_STATUS SEC_ENTRY SspiPrepareForCredWrite( PSEC_WINNT_AUTH_IDENTITY_OPAQ else { len = (id->UserLength + 1) * sizeof(WCHAR); - if (!(str = HeapAlloc(GetProcessHeap(), 0 , len ))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(str = malloc( len ))) return SEC_E_INSUFFICIENT_MEMORY; memcpy( str, id->User, id->UserLength * sizeof(WCHAR) ); str[id->UserLength] = 0; } - str2 = target ? strdupW( target ) : strdupW( str ); + str2 = target ? wcsdup( target ) : wcsdup( str ); if (!str2) { - HeapFree( GetProcessHeap(), 0, str ); + free( str ); return SEC_E_INSUFFICIENT_MEMORY; } len = id->PasswordLength * sizeof(WCHAR); - if (!(password = HeapAlloc(GetProcessHeap(), 0 , len ))) + if (!(password = malloc( len ))) { - HeapFree( GetProcessHeap(), 0, str ); - HeapFree( GetProcessHeap(), 0, str2 ); + free( str ); + free( str2 ); return SEC_E_INSUFFICIENT_MEMORY; } memcpy( password, id->Password, len );

1 0

Alex Henrie : ole32: Fix memory leak on error path in CompositeMonikerImpl_CommonPrefixWith (Coverity).
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: e6869fe920025c184ecf497573c61f13d7c1c6e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6869fe920025c184ecf497573c61f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 20:35:09 2022 -0700 ole32: Fix memory leak on error path in CompositeMonikerImpl_CommonPrefixWith (Coverity). --- dlls/ole32/compositemoniker.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 40f77459ef8..26c950a072e 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -751,7 +751,11 @@ static HRESULT WINAPI CompositeMonikerImpl_CommonPrefixWith(IMoniker *iface, IMo heap_free(components); heap_free(other_components); - if (!prefix_len) return MK_E_NOPREFIX; + if (!prefix_len) + { + heap_free(prefix_components); + return MK_E_NOPREFIX; + } last = prefix_components[0]; for (i = 1; i < prefix_len; ++i)

1 0

Alex Henrie : inetcomm: Use standard C functions for memory allocation in mimeole.c.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: 619be2bd7963e9f207fe2ec43d89ff28f7ebb62c URL: https://gitlab.winehq.org/wine/wine/-/commit/619be2bd7963e9f207fe2ec43d89ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 21:59:37 2022 -0700 inetcomm: Use standard C functions for memory allocation in mimeole.c. --- dlls/inetcomm/mimeole.c | 106 ++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 58 deletions(-)

1 0

Eric Pouech : d3d11/tests: Introduce a clear_uav() helper.
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

Module: wine Branch: master Commit: 623bc9fa54311d941d09760dc5300697ba11debe URL: https://gitlab.winehq.org/wine/wine/-/commit/623bc9fa54311d941d09760dc53006… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Nov 13 14:14:37 2022 +0100 d3d11/tests: Introduce a clear_uav() helper. This fixes warnings with gcc 12.2. (Copycat of 5fa25d00 about clear_rtv()) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2c96bc0018e..336f4b0ab7d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16349,6 +16349,13 @@ static void check_rgba_sint8_(unsigned int line, DWORD data, const struct uvec4 data, expected[0], expected[1], x, v->x, v->y, v->z, v->w); } +static void clear_uav(ID3D11DeviceContext *context, ID3D11UnorderedAccessView *uav, const struct uvec4 *uv4) +{ + /* Cast to (const unsigned int *) instead of passing &uv4->x, since gcc warns about + * overreading an unsigned int[4] from an unsigned int otherwise. */ + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, (const unsigned int *)uv4); +} + static void test_clear_buffer_unordered_access_view(void) { D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; @@ -16464,13 +16471,13 @@ static void test_clear_buffer_unordered_access_view(void) for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { uvec4 = uvec4_data[i]; - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); + clear_uav(context, uav, &uvec4); get_buffer_readback(buffer, &rb); SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1); check_readback_data_color(&rb, &rect, uvec4.x, 0); release_resource_readback(&rb); - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); + clear_uav(context, uav2, &fe_uvec4); get_buffer_readback(buffer, &rb); SetRect(&rect, 0, 0, U(uav_desc).Buffer.NumElements * buffer_desc.StructureByteStride / sizeof(uvec4.x), 1); check_readback_data_color(&rb, &rect, fe_uvec4.x, 0); @@ -16504,13 +16511,13 @@ static void test_clear_buffer_unordered_access_view(void) for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { uvec4 = uvec4_data[i]; - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); + clear_uav(context, uav, &uvec4); get_buffer_readback(buffer, &rb); SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1); check_readback_data_color(&rb, &rect, uvec4.x, 0); release_resource_readback(&rb); - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); + clear_uav(context, uav2, &fe_uvec4); get_buffer_readback(buffer, &rb); SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1); check_readback_data_color(&rb, &rect, uvec4.x, 0); @@ -16543,13 +16550,13 @@ static void test_clear_buffer_unordered_access_view(void) for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { uvec4 = uvec4_data[i]; - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); + clear_uav(context, uav, &uvec4); get_buffer_readback(buffer, &rb); SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1); check_readback_data_color(&rb, &rect, uvec4.x, 0); release_resource_readback(&rb); - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); + clear_uav(context, uav2, &fe_uvec4); get_buffer_readback(buffer, &rb); SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1); check_readback_data_color(&rb, &rect, uvec4.x, 0); @@ -16579,7 +16586,7 @@ static void test_clear_buffer_unordered_access_view(void) BOOL all_match; uvec4 = uvec4_data[i]; - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); + clear_uav(context, uav, &uvec4); get_buffer_readback(buffer, &rb); for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) { @@ -16595,7 +16602,7 @@ static void test_clear_buffer_unordered_access_view(void) data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x); release_resource_readback(&rb); - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); + clear_uav(context, uav2, &fe_uvec4); get_buffer_readback(buffer, &rb); for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) { @@ -16615,7 +16622,7 @@ static void test_clear_buffer_unordered_access_view(void) } uvec4.x = uvec4.y = uvec4.z = uvec4.w = 0xdeadbeef; - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); + clear_uav(context, uav, &uvec4); ID3D11UnorderedAccessView_Release(uav); ID3D11UnorderedAccessView_Release(uav2); @@ -16634,14 +16641,14 @@ static void test_clear_buffer_unordered_access_view(void) for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { uvec4 = uvec4_data[i]; - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); + clear_uav(context, uav, &uvec4); get_buffer_readback(buffer, &rb); todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4); todo_wine check_rgba_sint8(get_readback_color(&rb, 7, 0, 0), &uvec4); todo_wine check_rgba_sint8(get_readback_color(&rb, 15, 0, 0), &uvec4); release_resource_readback(&rb); - ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); + clear_uav(context, uav2, &fe_uvec4); get_buffer_readback(buffer, &rb); todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4); todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement - 1, 0, 0), &uvec4);

1 0

Nikolay Sivov : d2d1: Silently ignore non-default state block implementations.
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

Module: wine Branch: master Commit: 798d659f04250757ee18b009619f08d45e99b395 URL: https://gitlab.winehq.org/wine/wine/-/commit/798d659f04250757ee18b009619f08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 14 09:22:58 2022 +0300 d2d1: Silently ignore non-default state block implementations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53915 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 6 ++++-- dlls/d2d1/state_block.c | 6 +++++- dlls/d2d1/tests/d2d1.c | 10 ++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 72781a48d10..89d17149ca4 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1735,11 +1735,12 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_Flush(ID2D1DeviceContext1 *i static void STDMETHODCALLTYPE d2d_device_context_SaveDrawingState(ID2D1DeviceContext1 *iface, ID2D1DrawingStateBlock *state_block) { - struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_state_block *state_block_impl; TRACE("iface %p, state_block %p.\n", iface, state_block); + if (!(state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block))) return; state_block_impl->drawing_state = render_target->drawing_state; if (render_target->text_rendering_params) IDWriteRenderingParams_AddRef(render_target->text_rendering_params); @@ -1751,11 +1752,12 @@ static void STDMETHODCALLTYPE d2d_device_context_SaveDrawingState(ID2D1DeviceCon static void STDMETHODCALLTYPE d2d_device_context_RestoreDrawingState(ID2D1DeviceContext1 *iface, ID2D1DrawingStateBlock *state_block) { - struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + struct d2d_state_block *state_block_impl; TRACE("iface %p, state_block %p.\n", iface, state_block); + if (!(state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block))) return; if (context->target.type == D2D_TARGET_COMMAND_LIST) { struct d2d_command_list *command_list = context->target.command_list; diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 7415471ce3a..770c165fd90 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -186,6 +186,10 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat { if (!iface) return NULL; - assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl); + if (iface->lpVtbl != (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl) + { + WARN("Unexpected state block vtbl %p.\n", iface->lpVtbl); + return NULL; + } return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface); } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1dcce63381e..1935955ec84 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1835,6 +1835,7 @@ static void test_state_block(BOOL d3d11) ID2D1Factory *factory; ULONG refcount; HRESULT hr; + void *ptr; static const D2D1_MATRIX_3X2_F identity = {{{ 1.0f, 0.0f, @@ -2078,6 +2079,15 @@ static void test_state_block(BOOL d3d11) refcount = IDWriteRenderingParams_Release(text_rendering_params1); ok(!refcount, "Rendering params %lu references left.\n", refcount); + + /* State block object pointer is validated, but does not result in an error state. */ + ptr = (void *)0xdeadbeef; + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_SaveDrawingState(rt, (ID2D1DrawingStateBlock *)&ptr); + ID2D1RenderTarget_RestoreDrawingState(rt, (ID2D1DrawingStateBlock *)&ptr); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + release_test_context(&ctx); }

1 0

Alexandre Julliard : configure: Skip the rest of the PE checks if the cross-compiler isn't detected.
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

Module: wine Branch: master Commit: 266c97107b698ef70946e27b14b9529e9b4bc7e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/266c97107b698ef70946e27b14b952… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 21:14:18 2022 +0100 configure: Skip the rest of the PE checks if the cross-compiler isn't detected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53923 --- configure | 9 ++++++++- configure.ac | 11 +++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 0f8d5ff5044..8f780aff3ad 100755 --- a/configure +++ b/configure @@ -10886,10 +10886,17 @@ then : CFLAGS="$CFLAGS -target $target $llvm_cflags" fi } eval "${wine_arch}_TARGET=\$target" - PE_ARCHS="$PE_ARCHS $wine_arch" fi + if test -z "$target" + then + CC=$saved_CC + CFLAGS=$saved_CFLAGS + continue + fi + as_fn_append PE_ARCHS " $wine_arch" + as_wine_cv_crosscc_c99=`printf "%s\n" "ac_cv_${wine_arch}_crosscc_c99" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 diff --git a/configure.ac b/configure.ac index 076d30e581d..1d0ae5c3fc2 100644 --- a/configure.ac +++ b/configure.ac @@ -951,10 +951,17 @@ do AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" -target $target"]) CFLAGS="$CFLAGS -target $target $llvm_cflags"]) - AS_VAR_SET([${wine_arch}_TARGET],[$target]) - PE_ARCHS="$PE_ARCHS $wine_arch"]) + AS_VAR_SET([${wine_arch}_TARGET],[$target])]) AS_VAR_POPDEF([wine_cv_crosscc]) + if test -z "$target" + then + CC=$saved_CC + CFLAGS=$saved_CFLAGS + continue + fi + AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) + AS_VAR_PUSHDEF([wine_cv_crosscc_c99],[ac_cv_${wine_arch}_crosscc_c99]) AC_MSG_CHECKING([for $CC option to enable C99 features]) AC_CACHE_VAL([wine_cv_crosscc_c99],

1 0

Nikolay Sivov : d3dx9: Add missing path conversion call in D3DXLoadVolumeFromFileA().
by Alexandre Julliard Nov. 15, 2022

Nov. 15, 2022

Module: wine Branch: master Commit: f63f0d3b2bebe8bc4373cbce9c6d64d56f3e745e URL: https://gitlab.winehq.org/wine/wine/-/commit/f63f0d3b2bebe8bc4373cbce9c6d64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 15 07:02:20 2022 +0300 d3dx9: Add missing path conversion call in D3DXLoadVolumeFromFileA(). --- dlls/d3dx9_36/volume.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index d7d52b72626..c0357e0520e 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -38,6 +38,7 @@ HRESULT WINAPI D3DXLoadVolumeFromFileA(IDirect3DVolume9 *dst_volume, const PALET length = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); filenameW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(*filenameW)); if (!filenameW) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, length); hr = D3DXLoadVolumeFromFileW(dst_volume, dst_palette, dst_box, filenameW, src_box, filter, color_key, info);

1 0