March 2023 - Wine-commits - list.winehq.org

Rémi Bernon : dinput: Allow action formats with no matching actions.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 0fe8da86e33331e9e4c41a59fb65c63797445530 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fe8da86e33331e9e4c41a59fb65c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 22 09:21:48 2023 +0100 dinput: Allow action formats with no matching actions. --- dlls/dinput/device.c | 14 +++++--------- dlls/dinput/tests/joystick8.c | 4 ---- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 16c4409b9b3..2817ca9839b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1964,8 +1964,8 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D }; WCHAR username_buf[MAX_PATH]; DWORD username_len = MAX_PATH; - int i, index, num_actions = 0; unsigned int offset = 0; + int i, index; HRESULT hr; FIXME( "iface %p, format %p, username %s, flags %#lx stub!\n", iface, format, @@ -1973,14 +1973,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D if (!format) return DIERR_INVALIDPARAM; - /* Count the actions */ - for (i = 0; i < format->dwNumActions; i++) - if (IsEqualGUID( &impl->guid, &format->rgoAction[i].guidInstance )) - num_actions++; - - if (num_actions == 0) return DI_NOEFFECT; - - if (!(data_format.rgodf = malloc( sizeof(DIOBJECTDATAFORMAT) * num_actions ))) return DIERR_OUTOFMEMORY; + if (!(data_format.rgodf = malloc( sizeof(DIOBJECTDATAFORMAT) * format->dwNumActions ))) return DIERR_OUTOFMEMORY; data_format.dwDataSize = format->dwDataSize; for (i = 0; i < format->dwNumActions; i++, offset += sizeof(ULONG)) @@ -2026,6 +2019,9 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D LeaveCriticalSection( &impl->crit ); free( data_format.rgodf ); + + if (FAILED(hr)) return hr; + if (!data_format.dwNumObjs) return DI_NOEFFECT; return hr; } diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index c3866e4e177..6e8a9292f84 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -824,9 +824,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); hr = IDirectInputDevice_GetProperty( device, DIPROP_USERNAME, &prop_username.diph ); - todo_wine ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); - todo_wine ok( !wcscmp( prop_username.wsz, username ), "got username %s\n", debugstr_w(prop_username.wsz) ); hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_DEFAULT ); @@ -837,9 +835,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); hr = IDirectInputDevice_GetProperty( device, DIPROP_USERNAME, &prop_username.diph ); - todo_wine ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); - todo_wine ok( !wcscmp( prop_username.wsz, username ), "got username %s\n", debugstr_w(prop_username.wsz) );

1 0

Rémi Bernon : dinput: Check IDirectInputDevice8W_SetActionMap flags.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 5d3f2d18ad36993033bb046d5177fc7130894e2f URL: https://gitlab.winehq.org/wine/wine/-/commit/5d3f2d18ad36993033bb046d5177fc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 16:57:27 2023 +0100 dinput: Check IDirectInputDevice8W_SetActionMap flags. --- dlls/dinput/device.c | 1 + dlls/dinput/tests/joystick8.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2817ca9839b..0df0199317b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1972,6 +1972,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D debugstr_w(username), flags ); if (!format) return DIERR_INVALIDPARAM; + if (flags != DIDSAM_DEFAULT && flags != DIDSAM_FORCESAVE && flags != DIDSAM_NOUSER) return DIERR_INVALIDPARAM; if (!(data_format.rgodf = malloc( sizeof(DIOBJECTDATAFORMAT) * format->dwNumActions ))) return DIERR_OUTOFMEMORY; data_format.dwDataSize = format->dwDataSize; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 6e8a9292f84..7947e6e33cc 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -807,7 +807,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DIERR_INVALIDPARAM, "SetActionMap returned %#lx\n", hr ); flags = DIDSAM_FORCESAVE | DIDSAM_NOUSER; hr = IDirectInputDevice8_SetActionMap( device, &action_format_1, NULL, flags ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "SetActionMap returned %#lx\n", hr );

1 0

Alistair Leslie-Hughes : msado15: Bind fields in _Recordset Open.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 4ae5d2537be4f46da33abaddb01782affaf2f041 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ae5d2537be4f46da33abaddb01782… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 3 12:23:23 2021 +1100 msado15: Bind fields in _Recordset Open. --- dlls/msado15/recordset.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 54625158ac9..c263afe55ab 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -24,6 +24,7 @@ #include "objbase.h" #include "msado15_backcompat.h" #include "oledb.h" +#include "sqlucode.h" #include "wine/debug.h" @@ -49,6 +50,8 @@ struct recordset IRowset *row_set; EditModeEnum editmode; VARIANT filter; + + DBTYPE *columntypes; }; struct fields @@ -1210,12 +1213,15 @@ static void close_recordset( struct recordset *recordset ) if (!recordset->fields) return; col_count = get_column_count( recordset ); + free(recordset->columntypes); + for (i = 0; i < col_count; i++) { struct field *field = impl_from_Field( recordset->fields->field[i] ); field->recordset = NULL; Field_Release(&field->Field_iface); } + recordset->fields->count = 0; Fields_Release( &recordset->fields->Fields_iface ); recordset->fields = NULL; @@ -1672,6 +1678,111 @@ static HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText return S_OK; } +#define ROUND_SIZE(size) (((size) + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) + +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +static HRESULT create_bindings(IUnknown *rowset, struct recordset *recordset, DBBINDING **bind, DBBYTEOFFSET *size) +{ + HRESULT hr; + IColumnsInfo *columninfo; + DBORDINAL columns; + DBCOLUMNINFO *colinfo; + OLECHAR *stringsbuffer; + DBBINDING *bindings; + DBBYTEOFFSET offset; + + *size = 0; + + hr = IUnknown_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&columninfo); + if (FAILED(hr)) + return hr; + + hr = IColumnsInfo_GetColumnInfo(columninfo, &columns, &colinfo, &stringsbuffer); + if (SUCCEEDED(hr)) + { + ULONG i; + DBOBJECT *dbobj; + offset = 1; + + recordset->columntypes = malloc(sizeof(DBTYPE) * columns); + + /* Do one allocation for the bindings and append the DBOBJECTS to the end. + * This is to save on multiple allocations vs a little bit of extra memory. + */ + bindings = CoTaskMemAlloc( (sizeof(DBBINDING) + sizeof(DBOBJECT)) * columns); + dbobj = (DBOBJECT *)((char*)bindings + (sizeof(DBBINDING) * columns)); + + for (i=0; i < columns; i++) + { + TRACE("Column %lu, pwszName: %s, pTypeInfo %p, iOrdinal %Iu, dwFlags 0x%08lx, " + "ulColumnSize %Iu, wType %d, bPrecision %d, bScale %d\n", + i, debugstr_w(colinfo[i].pwszName), colinfo[i].pTypeInfo, colinfo[i].iOrdinal, + colinfo[i].dwFlags, colinfo[i].ulColumnSize, colinfo[i].wType, + colinfo[i].bPrecision, colinfo[i].bScale); + + hr = append_field(recordset->fields, colinfo[i].pwszName, colinfo[i].wType, colinfo[i].ulColumnSize, + colinfo[i].dwFlags, NULL); + + bindings[i].iOrdinal = colinfo[i].iOrdinal; + bindings[i].obValue = offset; + bindings[i].pTypeInfo = NULL; + /* Always assigned the pObject even if it's not used. */ + bindings[i].pObject = &dbobj[i]; + bindings[i].pObject->dwFlags = 0; + bindings[i].pObject->iid = IID_ISequentialStream; + bindings[i].pBindExt = NULL; + bindings[i].dwPart = DBPART_VALUE | DBPART_LENGTH | DBPART_STATUS; + bindings[i].dwMemOwner = DBMEMOWNER_CLIENTOWNED; + bindings[i].eParamIO = 0; + + recordset->columntypes[i] = colinfo[i].wType; + if (colinfo[i].dwFlags & DBCOLUMNFLAGS_ISLONG) + { + colinfo[i].wType = DBTYPE_IUNKNOWN; + + bindings[i].cbMaxLen = (colinfo[i].ulColumnSize + 1) * sizeof(WCHAR); + offset += sizeof(ISequentialStream*); + } + else if(colinfo[i].wType == DBTYPE_WSTR) + { + /* ulColumnSize is the number of characters in the string not the actual buffer size */ + bindings[i].cbMaxLen = colinfo[i].ulColumnSize * sizeof(WCHAR); + offset += bindings[i].cbMaxLen; + } + else + { + bindings[i].cbMaxLen = colinfo[i].ulColumnSize; + offset += bindings[i].cbMaxLen; + } + + bindings[i].dwFlags = 0; + bindings[i].wType = colinfo[i].wType; + bindings[i].bPrecision = colinfo[i].bPrecision; + bindings[i].bScale = colinfo[i].bScale; + } + + offset = ROUND_SIZE(offset); + for (i=0; i < columns; i++) + { + bindings[i].obLength = offset; + bindings[i].obStatus = offset + sizeof(DBBYTEOFFSET); + + offset += sizeof(DBBYTEOFFSET) + sizeof(DBBYTEOFFSET); + } + + *size = offset; + *bind = bindings; + + CoTaskMemFree(colinfo); + CoTaskMemFree(stringsbuffer); + } + + IColumnsInfo_Release(columninfo); + + return hr; +} + static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) { @@ -1682,6 +1793,8 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT DBROWCOUNT affected; IUnknown *rowset; HRESULT hr; + DBBINDING *bindings; + DBBYTEOFFSET datasize; FIXME( "%p, %s, %s, %d, %d, %ld Semi-stub\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); @@ -1726,6 +1839,29 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT if (FAILED(hr) || !rowset) return hr; + /* We want to create the field member variable without mapping the rowset fields, this will + * save quering the fields twice. Fields will be added while we create the bindings + */ + hr = fields_create( recordset, &recordset->fields ); + if (FAILED(hr)) + { + IUnknown_Release(rowset); + return hr; + } + + hr = create_bindings(rowset, recordset, &bindings, &datasize); + if (FAILED(hr)) + { + WARN("Failed to load bindings (%lx)\n", hr); + IUnknown_Release(rowset); + return hr; + } + + recordset->count = affected; + recordset->index = affected ? 0 : -1; + + CoTaskMemFree(bindings); + ADORecordsetConstruction_put_Rowset(&recordset->ADORecordsetConstruction_iface, rowset); recordset->cursor_type = cursor_type; recordset->state = adStateOpen; @@ -2339,6 +2475,7 @@ HRESULT Recordset_create( void **obj ) recordset->row_set = NULL; recordset->editmode = adEditNone; VariantInit( &recordset->filter ); + recordset->columntypes = NULL; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj );

1 0

Alistair Leslie-Hughes : msado15: Store all data from provider.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 49f70597454310c0ee9374cd17960c93e1408ad3 URL: https://gitlab.winehq.org/wine/wine/-/commit/49f70597454310c0ee9374cd17960c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 19 15:27:36 2023 +1100 msado15: Store all data from provider. --- dlls/msado15/recordset.c | 239 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 238 insertions(+), 1 deletion(-)

1 0

Brendan Shanks : winemac: Fix memory leak in UpdateDisplayDevices.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 644c54b1036dec4266e723319a362070f8e3ba8f URL: https://gitlab.winehq.org/wine/wine/-/commit/644c54b1036dec4266e723319a3620… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Mar 21 14:42:30 2023 -0700 winemac: Fix memory leak in UpdateDisplayDevices. --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 19ff72a7130..6a798994e47 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1208,6 +1208,7 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage device_manager->add_mode( mode, param ); } + free(modes); macdrv_free_monitors(monitors); }

1 0

Alex Henrie : include: Annotate ldap_(*_attribute|get_dn)* with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 151211284125da527eefa6e053031ef6696ee9c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/151211284125da527eefa6e053031e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 21 18:33:57 2023 -0600 include: Annotate ldap_(*_attribute|get_dn)* with __WINE_(DEALLOC|MALLOC). --- include/winldap.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/include/winldap.h b/include/winldap.h index 0b4037f133e..825d3f63b1e 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -499,16 +499,18 @@ ULONG CDECL ldap_extended_operationW(LDAP*,PWCHAR,struct berval*,PLDAPControlW*, ULONG CDECL ldap_extended_operation_sA(LDAP*,PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*,PCHAR*,struct berval**); ULONG CDECL ldap_extended_operation_sW(LDAP*,PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*,PWCHAR*,struct berval**); #define ldap_extended_operation_s WINELIB_NAME_AW(ldap_extended_operation_s) -PCHAR CDECL ldap_first_attributeA(LDAP*,LDAPMessage*,BerElement**); -PWCHAR CDECL ldap_first_attributeW(LDAP*,LDAPMessage*,BerElement**); +char* CDECL ldap_first_attributeA(LDAP*,LDAPMessage*,BerElement**) + __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR* CDECL ldap_first_attributeW(LDAP*,LDAPMessage*,BerElement**) + __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; #define ldap_first_attribute WINELIB_NAME_AW(ldap_first_attribute) LDAPMessage* CDECL ldap_first_entry(LDAP*,LDAPMessage*); LDAPMessage* CDECL ldap_first_reference(LDAP*,LDAPMessage*); ULONG CDECL ldap_free_controlsA(LDAPControlA**); ULONG CDECL ldap_free_controlsW(LDAPControlW**); #define ldap_free_controls WINELIB_NAME_AW(ldap_free_controls) -PCHAR CDECL ldap_get_dnA(LDAP*,LDAPMessage*); -PWCHAR CDECL ldap_get_dnW(LDAP*,LDAPMessage*); +char* CDECL ldap_get_dnA(LDAP*,LDAPMessage*) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR* CDECL ldap_get_dnW(LDAP*,LDAPMessage*) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; #define ldap_get_dn WINELIB_NAME_AW(ldap_get_dn) ULONG CDECL ldap_get_next_page(PLDAP,PLDAPSearch,ULONG,ULONG*); ULONG CDECL ldap_get_next_page_s(PLDAP,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,LDAPMessage**); @@ -552,8 +554,10 @@ ULONG CDECL ldap_modrdn_sA(LDAP*,PCHAR,PCHAR); ULONG CDECL ldap_modrdn_sW(LDAP*,PWCHAR,PWCHAR); #define ldap_modrdn_s WINELIB_NAME_AW(ldap_modrdn_s) ULONG CDECL ldap_msgfree(LDAPMessage*); -PCHAR CDECL ldap_next_attributeA(LDAP*,LDAPMessage*,BerElement*); -PWCHAR CDECL ldap_next_attributeW(LDAP*,LDAPMessage*,BerElement*); +char* CDECL ldap_next_attributeA(LDAP*,LDAPMessage*,BerElement*) + __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR* CDECL ldap_next_attributeW(LDAP*,LDAPMessage*,BerElement*) + __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; #define ldap_next_attribute WINELIB_NAME_AW(ldap_next_attribute) LDAPMessage * CDECL ldap_next_entry(LDAP*,LDAPMessage*); LDAP * CDECL ldap_openA(PCHAR,ULONG);

1 0

Alex Henrie : wldap32: Annotate allocation functions with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: e1930443fa5a84c392e5f4dd38fd409e2222c431 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1930443fa5a84c392e5f4dd38fd40… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 21 18:42:04 2023 -0600 wldap32: Annotate allocation functions with __WINE_(DEALLOC|MALLOC). --- dlls/wldap32/winldap_private.h | 53 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 69dca519b0e..aeeffcfcc15 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -367,20 +367,26 @@ typedef struct ldapsearch #define MSG(entry) (entry->Request) #define BER(ber) ((BerElement *)((ber)->opaque)) -WLDAP32_BerElement * CDECL WLDAP32_ber_alloc_t( int ); -BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL * ); void CDECL WLDAP32_ber_bvecfree( BERVAL ** ); void CDECL WLDAP32_ber_bvfree( BERVAL * ); +void CDECL WLDAP32_ber_free( WLDAP32_BerElement *, int ); +WLDAP32_BerElement * CDECL WLDAP32_ber_alloc_t( int ) __WINE_DEALLOC(WLDAP32_ber_free); +BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL * ) __WINE_DEALLOC(WLDAP32_ber_bvfree); ULONG CDECL WLDAP32_ber_first_element( WLDAP32_BerElement *, ULONG *, char ** ); int CDECL WLDAP32_ber_flatten( WLDAP32_BerElement *, BERVAL ** ); -void CDECL WLDAP32_ber_free( WLDAP32_BerElement *, int ); -WLDAP32_BerElement * CDECL WLDAP32_ber_init( BERVAL * ); +WLDAP32_BerElement * CDECL WLDAP32_ber_init( BERVAL * ) __WINE_DEALLOC(WLDAP32_ber_free); ULONG CDECL WLDAP32_ber_next_element( WLDAP32_BerElement *, ULONG *, char * ); ULONG CDECL WLDAP32_ber_peek_tag( WLDAP32_BerElement *, ULONG * ); ULONG CDECL WLDAP32_ber_skip_tag( WLDAP32_BerElement *, ULONG * ); int WINAPIV WLDAP32_ber_printf( WLDAP32_BerElement *, char *, ... ); ULONG WINAPIV WLDAP32_ber_scanf( WLDAP32_BerElement *, char *, ... ); +void CDECL ldap_memfreeA( char * ); +void CDECL ldap_memfreeW( WCHAR * ); +ULONG CDECL ldap_value_freeA( char ** ); +ULONG CDECL ldap_value_freeW( WCHAR ** ); +ULONG CDECL WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage * ); +ULONG CDECL WLDAP32_ldap_value_free_len(struct WLDAP32_berval **); ULONG CDECL ldap_addA( LDAP *, char *, LDAPModA ** ); ULONG CDECL ldap_addW( LDAP *, WCHAR *, LDAPModW ** ); ULONG CDECL ldap_add_extA( LDAP *, char *, LDAPModA **, LDAPControlA **, LDAPControlA **, ULONG * ); @@ -429,16 +435,12 @@ ULONG CDECL ldap_delete_ext_sA( LDAP *, char *, LDAPControlA **, LDAPControlA ** ULONG CDECL ldap_delete_ext_sW( LDAP *, WCHAR *, LDAPControlW **, LDAPControlW ** ); ULONG CDECL ldap_delete_sA( LDAP *, char * ); ULONG CDECL ldap_delete_sW( LDAP *, WCHAR * ); -char * CDECL ldap_dn2ufnA( char * ); -WCHAR * CDECL ldap_dn2ufnW( WCHAR * ); -void CDECL ldap_memfreeA( char * ); -void CDECL ldap_memfreeW( WCHAR * ); -char ** CDECL ldap_explode_dnA( char *, ULONG ); -WCHAR ** CDECL ldap_explode_dnW( WCHAR *, ULONG ); -ULONG CDECL ldap_value_freeA( char ** ); -ULONG CDECL ldap_value_freeW( WCHAR ** ); -char * CDECL ldap_get_dnA( LDAP *, WLDAP32_LDAPMessage * ); -WCHAR * CDECL ldap_get_dnW( LDAP *, WLDAP32_LDAPMessage * ); +char * CDECL ldap_dn2ufnA( char * ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_dn2ufnW( WCHAR * ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; +char ** CDECL ldap_explode_dnA( char *, ULONG ) __WINE_DEALLOC(ldap_value_freeA); +WCHAR ** CDECL ldap_explode_dnW( WCHAR *, ULONG ) __WINE_DEALLOC(ldap_value_freeW); +char * CDECL ldap_get_dnA( LDAP *, WLDAP32_LDAPMessage * ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_get_dnW( LDAP *, WLDAP32_LDAPMessage * ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; ULONG CDECL ldap_ufn2dnA( char *, char ** ); ULONG CDECL ldap_ufn2dnW( WCHAR *, WCHAR ** ); ULONG CDECL ldap_extended_operationA( LDAP *, char *, struct WLDAP32_berval *, LDAPControlA **, LDAPControlA **, @@ -461,11 +463,14 @@ ULONG CDECL ldap_start_tls_sA( LDAP *, ULONG *, WLDAP32_LDAPMessage **, LDAPCont ULONG CDECL ldap_start_tls_sW( LDAP *, ULONG *, WLDAP32_LDAPMessage **, LDAPControlW **, LDAPControlW ** ); ULONG CDECL ldap_check_filterA( LDAP *, char * ); ULONG CDECL ldap_check_filterW( LDAP *, WCHAR * ); -char * CDECL ldap_first_attributeA( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement ** ); -WCHAR * CDECL ldap_first_attributeW( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement ** ); -ULONG CDECL WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage * ); -char * CDECL ldap_next_attributeA( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement * ); -WCHAR * CDECL ldap_next_attributeW( LDAP *, WLDAP32_LDAPMessage *, WLDAP32_BerElement * ); +char * CDECL ldap_first_attributeA( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement ** ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_first_attributeW( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement ** ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; +char * CDECL ldap_next_attributeA( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement * ) __WINE_DEALLOC(ldap_memfreeA) __WINE_MALLOC; +WCHAR * CDECL ldap_next_attributeW( LDAP *, WLDAP32_LDAPMessage *, + WLDAP32_BerElement * ) __WINE_DEALLOC(ldap_memfreeW) __WINE_MALLOC; ULONG CDECL WLDAP32_ldap_result( LDAP *, ULONG, ULONG, struct l_timeval *, WLDAP32_LDAPMessage ** ); ULONG CDECL ldap_modifyA( LDAP *, char *, LDAPModA ** ); ULONG CDECL ldap_modifyW( LDAP *, WCHAR *, LDAPModW ** ); @@ -528,10 +533,12 @@ ULONG CDECL ldap_search_stA( LDAP *, const PCHAR, ULONG, const PCHAR, char **, U WLDAP32_LDAPMessage ** ); ULONG CDECL ldap_search_stW( LDAP *, const PWCHAR, ULONG, const PWCHAR, WCHAR **, ULONG, struct l_timeval *, WLDAP32_LDAPMessage ** ); -char ** CDECL ldap_get_valuesA( LDAP *, WLDAP32_LDAPMessage *, char * ); -WCHAR ** CDECL ldap_get_valuesW( LDAP *, WLDAP32_LDAPMessage *, WCHAR * ); -struct WLDAP32_berval ** CDECL ldap_get_values_lenA( LDAP *, LDAPMessage *, char * ); -struct WLDAP32_berval ** CDECL ldap_get_values_lenW( LDAP *, LDAPMessage *, WCHAR * ); +char ** CDECL ldap_get_valuesA( LDAP *, WLDAP32_LDAPMessage *, char * ) __WINE_DEALLOC(ldap_value_freeA); +WCHAR ** CDECL ldap_get_valuesW( LDAP *, WLDAP32_LDAPMessage *, WCHAR * ) __WINE_DEALLOC(ldap_value_freeW); +struct WLDAP32_berval ** CDECL ldap_get_values_lenA( LDAP *, LDAPMessage *, + char * ) __WINE_DEALLOC(WLDAP32_ldap_value_free_len); +struct WLDAP32_berval ** CDECL ldap_get_values_lenW( LDAP *, LDAPMessage *, + WCHAR * ) __WINE_DEALLOC(WLDAP32_ldap_value_free_len); ULONG map_error( int ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : d3dcompiler: Always initialize output shader blob pointer in D3DCompile2().
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 472d802a24eefe4a9c9f3a17592f50217c6e9966 URL: https://gitlab.winehq.org/wine/wine/-/commit/472d802a24eefe4a9c9f3a17592f50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 18 18:48:57 2023 +0100 d3dcompiler: Always initialize output shader blob pointer in D3DCompile2(). --- dlls/d3dcompiler_43/compiler.c | 2 ++ dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 8fb38cf592c..d3c7b81df12 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -462,6 +462,8 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen if (secondary_flags) FIXME("Ignoring secondary flags %#x.\n", secondary_flags); + if (shader_blob) + *shader_blob = NULL; if (messages_blob) *messages_blob = NULL; diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index a24cb9692e9..15af598c90d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -1412,7 +1412,8 @@ static void test_fail(void) { for (i = 0; i < ARRAY_SIZE(tests); ++i) { - compiled = errors = NULL; + errors = NULL; + compiled = (void *)0xdeadbeef; hr = D3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); ok(hr == E_FAIL, "Test %u, target %s: Got unexpected hr %#lx.\n", i, targets[j], hr); ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]);

1 0

Nikolay Sivov : d3dcompiler: Allow D3DCompile2() to succeed with null output shader blob pointer.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 5231c8c8bba49c5074b5876e44ef198d53c7845c URL: https://gitlab.winehq.org/wine/wine/-/commit/5231c8c8bba49c5074b5876e44ef19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 18 18:51:19 2023 +0100 d3dcompiler: Allow D3DCompile2() to succeed with null output shader blob pointer. --- dlls/d3dcompiler_43/compiler.c | 2 +- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index d3c7b81df12..a3c7b22581f 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -556,7 +556,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen vkd3d_shader_free_messages(messages); } - if (!ret) + if (!ret && shader_blob) { if (FAILED(hr = D3DCreateBlob(byte_code.size, shader_blob))) { diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 15af598c90d..b52b840f3bf 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -1742,6 +1742,22 @@ static void test_include(void) delete_directory(L"include"); } +static void test_no_output_blob(void) +{ + static const char vs_source[] = + "float4 main(float4 pos : POSITION, inout float2 texcoord : TEXCOORD0) : POSITION\n" + "{\n" + " return pos;\n" + "}"; + ID3D10Blob *errors; + HRESULT hr; + + errors = (void *)0xdeadbeef; + hr = D3DCompile(vs_source, strlen(vs_source), NULL, NULL, NULL, "main", "vs_2_0", 0, 0, NULL, &errors); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!errors, "Unexpected errors blob.\n"); +} + START_TEST(hlsl_d3d9) { HMODULE mod; @@ -1770,4 +1786,5 @@ START_TEST(hlsl_d3d9) test_constant_table(); test_fail(); test_include(); + test_no_output_blob(); }

1 0

Nikolay Sivov : d3dcompiler: Always free messages string in D3DCompile2().
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 929615fa13f7138b937602b68bbdda1f276a7d1d URL: https://gitlab.winehq.org/wine/wine/-/commit/929615fa13f7138b937602b68bbdda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 21 19:45:06 2023 +0100 d3dcompiler: Always free messages string in D3DCompile2(). --- dlls/d3dcompiler_43/compiler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index a3c7b22581f..3f302f23503 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -552,8 +552,8 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen } memcpy(ID3D10Blob_GetBufferPointer(*messages_blob), messages, size); } - else - vkd3d_shader_free_messages(messages); + + vkd3d_shader_free_messages(messages); } if (!ret && shader_blob)

1 0