- Wine-Devel - list.winehq.org

[PATCH 1/3] msdasql: Fix printf format warnings with long types.
by Alistair Leslie-Hughes Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 1 - dlls/msdasql/msdasql_main.c | 42 +++++++++++++------------- dlls/msdasql/session.c | 60 ++++++++++++++++++------------------- 3 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 3e9c482dbd3..0f5453131f6 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msdasql.dll IMPORTS = uuid ole32 oleaut32 odbc32 diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index d6c833c4c14..3e1af95b1a7 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -188,7 +188,7 @@ static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) { V_VT(dest) = VT_I4; V_I4(dest) = prop->value; - TRACE("%s = %#x\n", debugstr_w(src), prop->value); + TRACE("%s = %#lx\n", debugstr_w(src), prop->value); return S_OK; } @@ -303,7 +303,7 @@ static ULONG WINAPI msdsql_AddRef(IUnknown *iface) struct msdasql *provider = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&provider->ref); - TRACE("(%p) ref=%u\n", provider, ref); + TRACE("(%p) ref=%lu\n", provider, ref); return ref; } @@ -313,7 +313,7 @@ static ULONG WINAPI msdsql_Release(IUnknown *iface) struct msdasql *provider = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&provider->ref); - TRACE("(%p) ref=%u\n", provider, ref); + TRACE("(%p) ref=%lu\n", provider, ref); if (!ref) { @@ -362,7 +362,7 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert int i, j, k; DBPROPSET *propset; - TRACE("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + TRACE("(%p)->(%ld %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); *pcPropertySets = 1; @@ -397,7 +397,7 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert for (i=0; i < cPropertyIDSets; i++) { - TRACE("Property id %d (count %d, set %s)\n", i, rgPropertyIDSets[i].cPropertyIDs, + TRACE("Property id %d (count %ld, set %s)\n", i, rgPropertyIDSets[i].cPropertyIDs, debugstr_guid(&rgPropertyIDSets[i].guidPropertySet)); propset->cProperties = rgPropertyIDSets[i].cPropertyIDs; @@ -434,7 +434,7 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope int size = 1; OLECHAR *ptr; - TRACE("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + TRACE("(%p)->(%ld %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, prgPropertyInfoSets, ppDescBuffer); infoset = CoTaskMemAlloc(sizeof(DBPROPINFOSET)); @@ -474,7 +474,7 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert struct msdasql *provider = impl_from_IDBProperties(iface); int i, j, k; - TRACE("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + TRACE("(%p)->(%ld %p)\n", provider, cPropertySets, rgPropertySets); for (i=0; i < cPropertySets; i++) { @@ -757,7 +757,7 @@ static ULONG WINAPI msdasql_enum_AddRef(ISourcesRowset *iface) struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); ULONG ref = InterlockedIncrement(&enumerator->ref); - TRACE("(%p) ref=%u\n", enumerator, ref); + TRACE("(%p) ref=%lu\n", enumerator, ref); return ref; } @@ -767,7 +767,7 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface) struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); ULONG ref = InterlockedDecrement(&enumerator->ref); - TRACE("(%p) ref=%u\n", enumerator, ref); + TRACE("(%p) ref=%lu\n", enumerator, ref); if (!ref) { @@ -825,7 +825,7 @@ static ULONG WINAPI enum_rowset_AddRef(IRowset *iface) { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); LONG refs = InterlockedIncrement( &rowset->ref ); - TRACE( "%p new refcount %d\n", rowset, refs ); + TRACE( "%p new refcount %ld\n", rowset, refs ); return refs; } @@ -833,7 +833,7 @@ static ULONG WINAPI enum_rowset_Release(IRowset *iface) { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); LONG refs = InterlockedDecrement( &rowset->ref ); - TRACE( "%p new refcount %d\n", rowset, refs ); + TRACE( "%p new refcount %ld\n", rowset, refs ); if (!refs) { TRACE( "destroying %p\n", rowset ); @@ -847,7 +847,7 @@ static HRESULT WINAPI enum_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM count, { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); - FIXME("%p, %ld, %p, %p, %p\n", rowset, count, rows, ref_counts, status); + FIXME("%p, %Iu, %p, %p, %p\n", rowset, count, rows, ref_counts, status); return E_NOTIMPL; } @@ -856,7 +856,7 @@ static HRESULT WINAPI enum_rowset_GetData(IRowset *iface, HROW row, HACCESSOR ac { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); - FIXME("%p, %ld, %ld, %p\n", rowset, row, accessor, data); + FIXME("%p, %Iu, %Iu, %p\n", rowset, row, accessor, data); return E_NOTIMPL; } @@ -866,7 +866,7 @@ static HRESULT WINAPI enum_rowset_GetNextRows(IRowset *iface, HCHAPTER reserved, { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); - FIXME("%p, %ld, %ld, %ld, %p, %p\n", rowset, reserved, offset, count, obtained, rows); + FIXME("%p, %Iu, %Iu, %Iu, %p, %p\n", rowset, reserved, offset, count, obtained, rows); if (!obtained || !rows) return E_INVALIDARG; @@ -884,7 +884,7 @@ static HRESULT WINAPI enum_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM count, { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); - FIXME("%p, %ld, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); + FIXME("%p, %Iu, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); return S_OK; } @@ -893,7 +893,7 @@ static HRESULT WINAPI enum_rowset_RestartPosition(IRowset *iface, HCHAPTER reser { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); - FIXME("%p, %ld\n", rowset, reserved); + FIXME("%p, %Iu\n", rowset, reserved); return S_OK; } @@ -931,7 +931,7 @@ static ULONG WINAPI enum_rs_accessor_Release(IAccessor *iface) static HRESULT WINAPI enum_rs_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) { struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); - FIXME("%p, %lu, %p\n", rowset, accessor, count); + FIXME("%p, %Iu, %p\n", rowset, accessor, count); return E_NOTIMPL; } @@ -941,7 +941,7 @@ static HRESULT WINAPI enum_rs_accessor_CreateAccessor(IAccessor *iface, DBACCESS { struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); - FIXME("%p 0x%08x, %lu, %p, %lu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); + FIXME("%p 0x%08lx, %Iu, %p, %Iu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); if (accessor) *accessor = 0xdeadbeef; @@ -953,7 +953,7 @@ static HRESULT WINAPI enum_rs_accessor_GetBindings(IAccessor *iface, HACCESSOR a DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings) { struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); - FIXME("%p %lu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); + FIXME("%p, %Iu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); return E_NOTIMPL; } @@ -961,7 +961,7 @@ static HRESULT WINAPI enum_rs_accessor_ReleaseAccessor(IAccessor *iface, HACCESS { struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); - FIXME("%p, %lu, %p\n", rowset, accessor, count); + FIXME("%p, %Iu, %p\n", rowset, accessor, count); if (count) *count = 0; @@ -987,7 +987,7 @@ static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnkn struct msdasql_enum_rowset *enum_rs; HRESULT hr; - TRACE("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); + TRACE("(%p) %p, %s, %lu, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); enum_rs = malloc(sizeof(*enum_rs)); enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index e58d152a418..abd8252218d 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -143,7 +143,7 @@ static ULONG WINAPI session_AddRef(IUnknown *iface) { struct msdasql_session *session = impl_from_IUnknown( iface ); LONG refs = InterlockedIncrement( &session->refs ); - TRACE( "%p new refcount %d\n", session, refs ); + TRACE( "%p new refcount %ld\n", session, refs ); return refs; } @@ -151,7 +151,7 @@ static ULONG WINAPI session_Release(IUnknown *iface) { struct msdasql_session *session = impl_from_IUnknown( iface ); LONG refs = InterlockedDecrement( &session->refs ); - TRACE( "%p new refcount %d\n", session, refs ); + TRACE( "%p new refcount %ld\n", session, refs ); if (!refs) { TRACE( "destroying %p\n", session ); @@ -230,7 +230,7 @@ HRESULT WINAPI openrowset_OpenRowset(IOpenRowset *iface, IUnknown *pUnkOuter, DB DBID *index, REFIID riid, ULONG count, DBPROPSET propertysets[], IUnknown **rowset) { struct msdasql_session *session = impl_from_IOpenRowset( iface ); - FIXME("%p, %p, %p %p %s, %d %p %p stub\n", session, pUnkOuter, table, index, debugstr_guid(riid), + FIXME("%p, %p, %p %p %s, %ld %p %p stub\n", session, pUnkOuter, table, index, debugstr_guid(riid), count, propertysets, rowset); return E_NOTIMPL; @@ -267,7 +267,7 @@ static HRESULT WINAPI properties_GetProperties(ISessionProperties *iface, ULONG const DBPROPIDSET id_sets[], ULONG *count, DBPROPSET **sets) { struct msdasql_session *session = impl_from_ISessionProperties( iface ); - FIXME("%p %d %p %p %p\n", session, set_count, id_sets, count, sets); + FIXME("%p %lu %p %p %p\n", session, set_count, id_sets, count, sets); return E_NOTIMPL; } @@ -276,7 +276,7 @@ static HRESULT WINAPI properties_SetProperties(ISessionProperties *iface, ULONG DBPROPSET sets[]) { struct msdasql_session *session = impl_from_ISessionProperties( iface ); - FIXME("%p %d %p\n", session, count, sets); + FIXME("%p %lu %p\n", session, count, sets); return S_OK; } @@ -426,7 +426,7 @@ static ULONG WINAPI command_AddRef(ICommandText *iface) { struct command *command = impl_from_ICommandText( iface ); LONG refs = InterlockedIncrement( &command->refs ); - TRACE( "%p new refcount %d\n", command, refs ); + TRACE( "%p new refcount %ld\n", command, refs ); return refs; } @@ -434,7 +434,7 @@ static ULONG WINAPI command_Release(ICommandText *iface) { struct command *command = impl_from_ICommandText( iface ); LONG refs = InterlockedDecrement( &command->refs ); - TRACE( "%p new refcount %d\n", command, refs ); + TRACE( "%p new refcount %ld\n", command, refs ); if (!refs) { TRACE( "destroying %p\n", command ); @@ -551,7 +551,7 @@ static ULONG WINAPI msdasql_rowset_AddRef(IRowset *iface) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); LONG refs = InterlockedIncrement( &rowset->refs ); - TRACE( "%p new refcount %d\n", rowset, refs ); + TRACE( "%p new refcount %ld\n", rowset, refs ); return refs; } @@ -559,7 +559,7 @@ static ULONG WINAPI msdasql_rowset_Release(IRowset *iface) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); LONG refs = InterlockedDecrement( &rowset->refs ); - TRACE( "%p new refcount %d\n", rowset, refs ); + TRACE( "%p new refcount %ld\n", rowset, refs ); if (!refs) { TRACE( "destroying %p\n", rowset ); @@ -576,14 +576,14 @@ static HRESULT WINAPI msdasql_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM coun const HROW rows[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); - FIXME("%p, %ld, %p, %p, %p\n", rowset, count, rows, ref_counts, status); + FIXME("%p, %Id, %p, %p, %p\n", rowset, count, rows, ref_counts, status); return E_NOTIMPL; } static HRESULT WINAPI msdasql_rowset_GetData(IRowset *iface, HROW row, HACCESSOR accessor, void *data) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); - FIXME("%p, %ld, %ld, %p\n", rowset, row, accessor, data); + FIXME("%p, %Id, %Id, %p\n", rowset, row, accessor, data); return E_NOTIMPL; } @@ -591,7 +591,7 @@ static HRESULT WINAPI msdasql_rowset_GetNextRows(IRowset *iface, HCHAPTER reserv DBROWCOUNT count, DBCOUNTITEM *obtained, HROW **rows) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); - FIXME("%p, %ld, %ld, %ld, %p, %p\n", rowset, reserved, offset, count, obtained, rows); + FIXME("%p, %Id, %Id, %Id, %p, %p\n", rowset, reserved, offset, count, obtained, rows); return E_NOTIMPL; } @@ -600,14 +600,14 @@ static HRESULT WINAPI msdasql_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM cou { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); - FIXME("%p, %ld, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); + FIXME("%p, %Id, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); return E_NOTIMPL; } static HRESULT WINAPI msdasql_rowset_RestartPosition(IRowset *iface, HCHAPTER reserved) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); - FIXME("%p, %ld\n", rowset, reserved); + FIXME("%p, %Id\n", rowset, reserved); return E_NOTIMPL; } @@ -645,7 +645,7 @@ static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %d, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + FIXME("%p, %lu, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); return E_NOTIMPL; } @@ -653,7 +653,7 @@ static HRESULT WINAPI rowset_info_GetReferencedRowset(IRowsetInfo *iface, DBORDI REFIID riid, IUnknown **unk) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %ld, %s, %p\n", rowset, ordinal, debugstr_guid(riid), unk); + FIXME("%p, %Id, %s, %p\n", rowset, ordinal, debugstr_guid(riid), unk); return E_NOTIMPL; } @@ -713,7 +713,7 @@ static HRESULT WINAPI rowset_colsinfo_MapColumnIDs(IColumnsInfo *iface, DBORDINA const DBID *dbids, DBORDINAL *columns) { struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); - FIXME("%p, %lu, %p, %p\n", rowset, column_ids, dbids, columns); + FIXME("%p, %Id, %p, %p\n", rowset, column_ids, dbids, columns); return E_NOTIMPL; } @@ -747,7 +747,7 @@ static ULONG WINAPI rowset_accessor_Release(IAccessor *iface) static HRESULT WINAPI rowset_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) { struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); - FIXME("%p, %lu, %p\n", rowset, accessor, count); + FIXME("%p, %Id, %p\n", rowset, accessor, count); return E_NOTIMPL; } @@ -756,7 +756,7 @@ static HRESULT WINAPI rowset_accessor_CreateAccessor(IAccessor *iface, DBACCESSO DBBINDSTATUS status[]) { struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); - FIXME("%p 0x%08x, %lu, %p, %lu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); + FIXME("%p, 0x%08lx, %Id, %p, %Id, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); return E_NOTIMPL; } @@ -764,14 +764,14 @@ static HRESULT WINAPI rowset_accessor_GetBindings(IAccessor *iface, HACCESSOR ac DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings) { struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); - FIXME("%p %lu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); + FIXME("%p, %Id, %p, %p, %p\n", rowset, accessor, flags, count, bindings); return E_NOTIMPL; } static HRESULT WINAPI rowset_accessor_ReleaseAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) { struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); - FIXME("%p, %lu, %p\n", rowset, accessor, count); + FIXME("%p, %Id, %p\n", rowset, accessor, count); return E_NOTIMPL; } @@ -815,7 +815,7 @@ static HRESULT WINAPI column_rs_GetColumnsRowset(IColumnsRowset *iface, IUnknown const DBID columns[], REFIID riid, ULONG property_cnt, DBPROPSET property_sets[], IUnknown **unk_rs) { struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); - FIXME("(%p)->(%p %ld %p %s %u, %p %p): stub\n", rowset, outer, count, columns, debugstr_guid(riid), + FIXME("(%p)->(%p, %Id, %p, %s, %lu, %p, %p): stub\n", rowset, outer, count, columns, debugstr_guid(riid), property_cnt, property_sets, unk_rs); return E_NOTIMPL; } @@ -953,7 +953,7 @@ static HRESULT WINAPI command_prop_GetProperties(ICommandProperties *iface, ULON const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) { struct command *command = impl_from_ICommandProperties( iface ); - FIXME("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); + FIXME("%p %lu %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); return E_NOTIMPL; } @@ -961,7 +961,7 @@ static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULON DBPROPSET propertyset[]) { struct command *command = impl_from_ICommandProperties( iface ); - FIXME("%p %p\n", command, propertyset); + FIXME("%p, %lu, %p\n", command, count, propertyset); return S_OK; } @@ -1004,7 +1004,7 @@ static HRESULT WINAPI colsinfo_MapColumnIDs(IColumnsInfo *iface, DBORDINAL colum const DBID *dbids, DBORDINAL *columns) { struct command *command = impl_from_IColumnsInfo( iface ); - FIXME("%p, %lu, %p, %p\n", command, column_ids, dbids, columns); + FIXME("%p, %Iu, %p, %p\n", command, column_ids, dbids, columns); return E_NOTIMPL; } @@ -1038,7 +1038,7 @@ static ULONG WINAPI converttype_Release(IConvertType *iface) static HRESULT WINAPI converttype_CanConvert(IConvertType *iface, DBTYPE from, DBTYPE to, DBCONVERTFLAGS flags) { struct command *command = impl_from_IConvertType( iface ); - FIXME("%p, %u, %d, 0x%08x\n", command, from, to, flags); + FIXME("%p, %u, %d, 0x%08lx\n", command, from, to, flags); return E_NOTIMPL; } @@ -1073,7 +1073,7 @@ static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) struct command *command = impl_from_ICommandPrepare( iface ); RETCODE ret; - TRACE("%p, %u\n", command, runs); + TRACE("%p, %lu\n", command, runs); if (!command->query) return DB_E_NOCOMMAND; @@ -1138,7 +1138,7 @@ static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters * LPCWSTR names[], DB_LPARAMS ordinals[]) { struct command *command = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", command, uparams, names, ordinals); + FIXME("%p, %Iu, %p, %p\n", command, uparams, names, ordinals); return E_NOTIMPL; } @@ -1146,7 +1146,7 @@ static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *i const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) { struct command *command = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", command, uparams, ordinals, bindinfo); + FIXME("%p, %Iu, %p, %p\n", command, uparams, ordinals, bindinfo); return E_NOTIMPL; } @@ -1234,7 +1234,7 @@ static HRESULT WINAPI transjoin_JoinTransaction(ITransactionJoin *iface, IUnknow { struct msdasql_session *session = impl_from_ITransactionJoin( iface ); - FIXME("%p, %p, %d, 0x%08x, %p\n", session, unk, level, flags, options); + FIXME("%p, %p, %lu, 0x%08lx, %p\n", session, unk, level, flags, options); return E_NOTIMPL; } -- 2.34.1

1 0

[PATCH 1/3] hidclass.sys: Fix printf format warnings with long types.
by Rémi Bernon Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/Makefile.in | 1 - dlls/hidclass.sys/device.c | 10 +++++----- dlls/hidclass.sys/pnp.c | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index b597589dc53..788828ad66a 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hidclass.sys IMPORTLIB = hidclass IMPORTS = hal ntoskrnl user32 hidparse diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 0744865f8f7..c252125d8eb 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -351,7 +351,7 @@ static DWORD CALLBACK hid_device_thread(void *args) if (!(report = find_report_with_type_and_id( ext, HidP_Input, buffer[0], FALSE ))) WARN( "dropping unknown input id %u\n", buffer[0] ); else if (!polled && io.Information < report->InputLength) - WARN( "dropping short report, len %u expected %u\n", (ULONG)io.Information, report->InputLength ); + WARN( "dropping short report, len %Iu expected %u\n", io.Information, report->InputLength ); else { packet->reportId = buffer[0]; @@ -364,7 +364,7 @@ static DWORD CALLBACK hid_device_thread(void *args) res = WaitForSingleObject(ext->u.pdo.halt_event, polled ? ext->u.pdo.poll_interval : 0); } while (res == WAIT_TIMEOUT); - TRACE("device thread exiting, res %#x\n", res); + TRACE( "device thread exiting, res %#lx\n", res ); return 1; } @@ -561,7 +561,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = 0; - TRACE("device %p ioctl(%x)\n", device, irpsp->Parameters.DeviceIoControl.IoControlCode); + TRACE( "device %p code %#lx\n", device, irpsp->Parameters.DeviceIoControl.IoControlCode ); KeAcquireSpinLock(&ext->u.pdo.lock, &irql); removed = ext->u.pdo.removed; @@ -661,8 +661,8 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; - FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", - code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + FIXME( "Unsupported ioctl %#lx (device=%lx access=%lx func=%lx method=%lx)\n", code, + code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3 ); irp->IoStatus.Status = STATUS_NOT_SUPPORTED; break; } diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 6dafa1b95af..fec51af40a9 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -143,13 +143,13 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b if ((status = get_device_id(bus_pdo, BusQueryDeviceID, device_id))) { - ERR("Failed to get PDO device id, status %#x.\n", status); + ERR( "Failed to get PDO device id, status %#lx.\n", status ); return status; } if ((status = get_device_id(bus_pdo, BusQueryInstanceID, instance_id))) { - ERR("Failed to get PDO instance id, status %#x.\n", status); + ERR( "Failed to get PDO instance id, status %#lx.\n", status ); return status; } @@ -159,7 +159,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b if ((status = IoCreateDevice(driver, sizeof(*ext) + minidriver->minidriver.DeviceExtensionSize, NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &fdo))) { - ERR("Failed to create bus FDO, status %#x.\n", status); + ERR( "Failed to create bus FDO, status %#lx.\n", status ); return status; } ext = fdo->DeviceExtension; @@ -177,7 +177,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b status = minidriver->AddDevice(minidriver->minidriver.DriverObject, fdo); if (status != STATUS_SUCCESS) { - ERR("Minidriver AddDevice failed (%x)\n",status); + ERR( "Minidriver AddDevice failed (%lx)\n", status ); IoDeleteDevice(fdo); return status; } @@ -206,7 +206,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) call_minidriver( IOCTL_HID_GET_DEVICE_ATTRIBUTES, fdo, NULL, 0, &attr, sizeof(attr), &io ); if (io.Status != STATUS_SUCCESS) { - ERR( "Minidriver failed to get attributes, status %#x.\n", io.Status ); + ERR( "Minidriver failed to get attributes, status %#lx.\n", io.Status ); return; } @@ -215,7 +215,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) RtlInitUnicodeString(&string, pdo_name); if ((status = IoCreateDevice(fdo->DriverObject, sizeof(*pdo_ext), &string, 0, 0, FALSE, &child_pdo))) { - ERR( "Failed to create child PDO, status %#x.\n", io.Status ); + ERR( "Failed to create child PDO, status %#lx.\n", io.Status ); return; } fdo_ext->u.fdo.child_pdo = child_pdo; @@ -236,7 +236,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) call_minidriver( IOCTL_HID_GET_DEVICE_DESCRIPTOR, fdo, NULL, 0, &descriptor, sizeof(descriptor), &io ); if (io.Status != STATUS_SUCCESS) { - ERR("Cannot get Device Descriptor(%x)\n",status); + ERR( "Cannot get Device Descriptor, status %#lx\n", status ); IoDeleteDevice(child_pdo); return; } @@ -256,7 +256,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) descriptor.DescriptorList[i].wReportLength, &io ); if (io.Status != STATUS_SUCCESS) { - ERR("Cannot get Report Descriptor(%x)\n",status); + ERR( "Cannot get Report Descriptor, status %#lx\n", status ); free(reportDescriptor); IoDeleteDevice(child_pdo); return; @@ -290,7 +290,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) PLUGPLAY_PROPERTY_PERSISTENT, DEVPROP_TYPE_UINT32, sizeof(pdo_ext->u.pdo.rawinput_handle), &pdo_ext->u.pdo.rawinput_handle))) { - ERR("Failed to set device handle property, status %x\n", status); + ERR( "Failed to set device handle property, status %#lx\n", status ); IoDeleteDevice(child_pdo); return; } @@ -444,7 +444,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_START_DEVICE: if ((status = IoRegisterDeviceInterface(device, ext->class_guid, NULL, &ext->u.pdo.link_name))) { - ERR("Failed to register interface, status %#x.\n", status); + ERR( "Failed to register interface, status %#lx.\n", status ); break; } -- 2.34.1

1 2

[v2 PATCH] dwrite: use correct integral types.
by Nikolay Sivov Feb. 1, 2022

Feb. 1, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 2 +- dlls/dwrite/main.c | 3 ++- dlls/dwrite/opentype.c | 5 +++-- dlls/dwrite/shape.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index cbc0434b72d..4b32bf1e0de 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5084,7 +5084,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 struct dwrite_fontcollection *collection; WCHAR eudckeypathW[16]; HKEY eudckey; - DWORD index; + UINT32 index; BOOL exists; LONG retval; HRESULT hr; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ab53d5cb80d..26415201d91 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1515,8 +1515,9 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory7 *if static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count) { - unsigned int index = 0, value_size, name_count, max_name_count, type, data_size; + unsigned int index = 0, value_size, max_name_count; WCHAR **paths = NULL, *name, *value = NULL; + DWORD name_count, type, data_size; size_t capacity = 0, count = 0; HKEY hkey; LONG r; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 452b00240b8..5bac32f9ee7 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4607,8 +4607,8 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex next_bit = global_bit_shift + 1; for (i = 0; i < features->count; ++i) { - unsigned int bits_needed; BOOL found = FALSE; + DWORD bits_needed; feature = &features->features[i]; @@ -5077,7 +5077,8 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con if (format == 1) { const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); - unsigned int shift, alt_index; + DWORD shift; + unsigned int alt_index; UINT16 set_offset; coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 177ad1d06fe..bf80d686052 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -67,10 +67,10 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache) free(cache); } -static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, +static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const unsigned int *scripts, unsigned int *script_index) { - static const DWORD fallback_scripts[] = + static const unsigned int fallback_scripts[] = { DWRITE_MAKE_OPENTYPE_TAG('D','F','L','T'), DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'), -- 2.34.1

1 0

[PATCH 1/6] ws2_32/tests: Add tests for WSAStartup().
by Zebediah Figura Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/protocol.c | 99 ++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 5597e3df854..a23cf51a8bd 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2815,10 +2815,86 @@ static void test_WSCGetProviderPath(void) ok(len == 256, "Got unexpected len %d.\n", len); } +static void test_startup(void) +{ + unsigned int i; + WSADATA data; + int ret; + + static const struct + { + WORD version; + WORD ret_version; + } + tests[] = + { + {MAKEWORD(0, 0), MAKEWORD(2, 2)}, + {MAKEWORD(0, 1), MAKEWORD(2, 2)}, + {MAKEWORD(1, 0), MAKEWORD(1, 0)}, + {MAKEWORD(1, 1), MAKEWORD(1, 1)}, + {MAKEWORD(1, 2), MAKEWORD(1, 1)}, + {MAKEWORD(1, 0xff), MAKEWORD(1, 1)}, + {MAKEWORD(2, 0), MAKEWORD(2, 0)}, + {MAKEWORD(2, 1), MAKEWORD(2, 1)}, + {MAKEWORD(2, 2), MAKEWORD(2, 2)}, + {MAKEWORD(2, 3), MAKEWORD(2, 2)}, + {MAKEWORD(2, 0xff), MAKEWORD(2, 2)}, + {MAKEWORD(3, 0), MAKEWORD(2, 2)}, + {MAKEWORD(0xff, 0), MAKEWORD(2, 2)}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Version %#x", tests[i].version); + + memset(&data, 0xcc, sizeof(data)); + data.lpVendorInfo = (void *)0xdeadbeef; + ret = WSAStartup(tests[i].version, &data); + ok(ret == (LOBYTE(tests[i].version) ? 0 : WSAVERNOTSUPPORTED), "got %d\n", ret); + todo_wine_if (tests[i].version != tests[i].ret_version) + ok(data.wVersion == tests[i].ret_version, "got version %#x\n", data.wVersion); + if (!ret) + { + ret = WSAStartup(tests[i].version, &data); + ok(!ret, "got %d\n", ret); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + } + ok(data.lpVendorInfo == (void *)0xdeadbeef, "got vendor info %p\n", data.lpVendorInfo); + todo_wine_if (ret) + { + ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); + ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); + ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); + } + todo_wine ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); + todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSANOTINITIALISED, "got error %u\n", WSAGetLastError()); + + ret = WSAStartup(tests[i].version, NULL); + todo_wine_if (LOBYTE(tests[i].version)) + ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret); + + winetest_pop_context(); + } +} + START_TEST( protocol ) { WSADATA data; - WORD version = MAKEWORD( 2, 2 ); + int ret; pFreeAddrInfoExW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "FreeAddrInfoExW"); pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "GetAddrInfoExOverlappedResult"); @@ -2830,7 +2906,8 @@ START_TEST( protocol ) pInetPtonW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "InetPtonW"); pWSCGetProviderInfo = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "WSCGetProviderInfo"); - if (WSAStartup( version, &data )) return; + ret = WSAStartup(0x202, &data); + ok(!ret, "got %d\n", ret); test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); @@ -2839,8 +2916,6 @@ START_TEST( protocol ) test_getservbyname(); test_WSALookupService(); - test_WSAAsyncGetServByPort(); - test_WSAAsyncGetServByName(); test_inet_ntoa(); test_inet_pton(); @@ -2862,4 +2937,20 @@ START_TEST( protocol ) test_WSAEnumNameSpaceProvidersW(); test_WSCGetProviderInfo(); test_WSCGetProviderPath(); + + WSACleanup(); + + /* These tests are finnicky. If WSAStartup() is ever called with a + * version below 2.2, it causes getaddrinfo() to behave differently. */ + + test_startup(); + + /* And if WSAAsyncGetServBy*() is ever called, it somehow causes + * WSAStartup() to succeed with 0.1 instead of failing. */ + + ret = WSAStartup(0x202, &data); + ok(!ret, "got %d\n", ret); + + test_WSAAsyncGetServByPort(); + test_WSAAsyncGetServByName(); } -- 2.34.1

2 6

[PATCH 12/22] taskschd/tests: Avoid "misleading indentation" warnings.
by Fabian Maurer Feb. 1, 2022

Feb. 1, 2022

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/taskschd/tests/scheduler.c | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c03ecd35b97..e7b39e5fdaf 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -151,11 +151,11 @@ static void test_GetFolder(void) ok(hr == S_OK, "Connect error %#x\n", hr); hr = ITaskService_GetFolder(service, slash, &folder); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, dot, &folder); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, "expected ERROR_INVALID_NAME, got %#x\n", hr); @@ -198,7 +198,7 @@ todo_wine ITaskFolder_DeleteFolder(folder, Wine, 0); hr = ITaskFolder_CreateFolder(folder, slash, v_null, &subfolder); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); @@ -206,7 +206,7 @@ todo_wine "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); @@ -360,7 +360,7 @@ todo_wine ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, slash, 0); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); ITaskFolder_Release(folder); @@ -799,7 +799,7 @@ static void test_GetTask(void) ok(hr == S_OK, "RegisterTask error %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || broken(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) /* Vista */, "expected ERROR_ACCESS_DENIED, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); @@ -860,11 +860,11 @@ todo_wine SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); ok(hr == S_OK, "get_Enabled error %#x\n", hr); -todo_wine + todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task2); @@ -897,11 +897,11 @@ todo_wine ok(hr == S_OK, "put_Enabled error %#x\n", hr); hr = IRegisteredTask_get_State(task1, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); ok(hr == S_OK, "get_Enabled error %#x\n", hr); -todo_wine + todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task1); @@ -919,11 +919,11 @@ todo_wine SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); ok(hr == S_OK, "get_Enabled error %#x\n", hr); -todo_wine + todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); hr = IRegisteredTask_get_State(task2, NULL); @@ -934,7 +934,7 @@ todo_wine IRegisteredTask_Release(task2); hr = ITaskFolder_DeleteTask(folder, NULL, 0); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); hr = ITaskFolder_DeleteTask(root, Wine_Task1, 0); @@ -1592,7 +1592,7 @@ static void test_TaskDefinition(void) MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine + todo_wine ok(hr == SCHED_E_UNEXPECTEDNODE, "expected SCHED_E_UNEXPECTEDNODE, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, ARRAY_SIZE(xmlW)); @@ -1601,7 +1601,7 @@ todo_wine MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine + todo_wine ok(hr == SCHED_E_MISSINGNODE, "expected SCHED_E_MISSINGNODE, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, ARRAY_SIZE(xmlW)); @@ -1703,10 +1703,10 @@ todo_wine V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; hr = IRegistrationInfo_get_SecurityDescriptor(reginfo, &var); -todo_wine + todo_wine ok(hr == S_OK, "get_SecurityDescriptor error %#x\n", hr); -if (hr == S_OK) - ok(V_VT(&var) == VT_EMPTY, "expected VT_EMPTY, got %u\n", V_VT(&var)); + if (hr == S_OK) + ok(V_VT(&var) == VT_EMPTY, "expected VT_EMPTY, got %u\n", V_VT(&var)); IRegistrationInfo_Release(reginfo); -- 2.35.0

5 18

[PATCH] user32: Remove no longer needed assert() workarounds for MinGW.
by Zebediah Figura Feb. 1, 2022

Feb. 1, 2022

We build with msvcrt, so we don't link against MinGW's assert() anymore. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/user_private.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3b542ea1452..d1016780658 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -296,12 +296,6 @@ typedef struct extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; -/* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ -#ifdef __MINGW32__ -#undef assert -#define assert(expr) ((void)0) -#endif - extern struct user_api_hook *user_api DECLSPEC_HIDDEN; LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; -- 2.34.1

2 3

[PATCH 3/4] msvcrt: Don't use fegetenv in nearbyint.
by Piotr Caban Feb. 1, 2022

Feb. 1, 2022

The fegetenv/feupdateenv functions are broken in msvcr120 and are causing unintentional SSE control word changes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 29 +++++++++++++++++++++++++++++ dlls/msvcrt/math.c | 27 ++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 5 deletions(-)

2 1

[PATCH v2] quartz/tests: Avoid "misleading indentation" warnings.
by Zebediah Figura Feb. 1, 2022

Feb. 1, 2022

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Use consistent formatting with other tests. dlls/quartz/tests/acmwrapper.c | 6 ++--- dlls/quartz/tests/filtergraph.c | 38 +++++++++++-------------------- dlls/quartz/tests/videorenderer.c | 3 +-- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 31b32b53ac9..8b9a472c0f3 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -380,8 +380,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); -todo_wine - ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -412,8 +411,7 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); -todo_wine - ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", debugstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index a83bfde0806..620a1a56bad 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2474,8 +2474,7 @@ static void test_graph_builder_connect(void) IFilterGraph2_AddFilter(graph, &sink2.IBaseFilter_iface, NULL); hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine - ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr); + todo_wine ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); ok(!parser1_pins[2].peer, "Got peer %p.\n", parser1_pins[2].peer); @@ -3105,32 +3104,24 @@ static void test_connect_direct(void) /* Swap the pins when connecting. */ hr = IFilterGraph2_ConnectDirect(graph, &sink_pin.IPin_iface, &source_pin.IPin_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine - ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); + todo_wine ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); ok(!sink_pin.mt, "Got mt %p.\n", sink_pin.mt); -todo_wine - ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); -todo_wine - ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine - ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); hr = IFilterGraph2_Connect(graph, &sink_pin.IPin_iface, &source_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine - ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); + todo_wine ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); ok(!sink_pin.mt, "Got mt %p.\n", sink_pin.mt); -todo_wine - ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); -todo_wine - ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine - ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); /* Disconnect() does not disconnect the peer. */ @@ -3304,8 +3295,7 @@ todo_wine ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref); ok(sink.ref == 1, "Got outstanding refcount %d.\n", sink.ref); ok(source_pin.ref == 1, "Got outstanding refcount %d.\n", source_pin.ref); -todo_wine - ok(sink_pin.ref == 1, "Got outstanding refcount %d.\n", sink_pin.ref); + todo_wine ok(sink_pin.ref == 1, "Got outstanding refcount %d.\n", sink_pin.ref); ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); } @@ -3350,8 +3340,7 @@ static void test_sync_source(void) ok(!filter2.clock, "Got clock %p.\n", filter2.clock); hr = IMediaFilter_GetSyncSource(filter, &clock); -todo_wine - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(!clock, "Got clock %p.\n", clock); IReferenceClock_Release(systemclock); @@ -3647,9 +3636,8 @@ static void test_filter_state(void) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); -todo_wine - ok(source.start_time > 0 && source.start_time < 500 * 10000, - "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); + todo_wine ok(source.start_time > 0 && source.start_time < 500 * 10000, + "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 5625971426b..ec212f1b5d6 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -347,8 +347,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); -todo_wine - ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); -- 2.34.1

2 1

[PATCH v4 1/4] wdscore: Implement CurrentIP.
by Mohamad Al-Jaf Feb. 1, 2022

Feb. 1, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v4: - Remove WINAPI in the function in main.c and tests/main.c. Since WINAPI cleans the stack, it doesn't make sense to use it in this context. --- configure.ac | 1 + dlls/wdscore/Makefile.in | 3 ++ dlls/wdscore/main.c | 54 ++++++++++++++++++++++++++++ dlls/wdscore/tests/Makefile.in | 4 +++ dlls/wdscore/tests/main.c | 65 ++++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore.spec | 2 +- 6 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 dlls/wdscore/main.c create mode 100644 dlls/wdscore/tests/Makefile.in create mode 100644 dlls/wdscore/tests/main.c diff --git a/configure.ac b/configure.ac index 0b1a53f3ff9..1923c95f4b4 100644 --- a/configure.ac +++ b/configure.ac @@ -3345,6 +3345,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) WINE_CONFIG_MAKEFILE(dlls/wdscore) +WINE_CONFIG_MAKEFILE(dlls/wdscore/tests) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/websocket) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 20ba1d3b1c9..2020e72c7bb 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,3 +1,6 @@ MODULE = wdscore.dll EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/main.c b/dlls/wdscore/main.c new file mode 100644 index 00000000000..9001838431d --- /dev/null +++ b/dlls/wdscore/main.c @@ -0,0 +1,54 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/asm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +/*********************************************************************** + * CurrentIP (wdscore.@) + */ +#ifdef __i386__ +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movl (%esp), %eax\n\t" + "ret" ) +#elif defined(__x86_64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movq (%rsp), %rax\n\t" + "ret" ) +#elif defined(__arm__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov r0, lr\n\t" + "bx lr" ) +#elif defined(__aarch64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov x0, lr\n\t" + "ret" ) +#else +void *CurrentIP(void) +{ + FIXME( "not implemented\n" ); + return 0; +} +#endif diff --git a/dlls/wdscore/tests/Makefile.in b/dlls/wdscore/tests/Makefile.in new file mode 100644 index 00000000000..baf4adf23a1 --- /dev/null +++ b/dlls/wdscore/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = wdscore.dll + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/tests/main.c b/dlls/wdscore/tests/main.c new file mode 100644 index 00000000000..f17abbbdb3f --- /dev/null +++ b/dlls/wdscore/tests/main.c @@ -0,0 +1,65 @@ +/* + * Unit test suite for wdscore + * + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/test.h" + +static HMODULE dll; +static void* (*pCurrentIP)(void); + +static BOOL init_function_pointers(void) +{ + dll = LoadLibraryA("wdscore.dll"); + + if (dll) + { + pCurrentIP = (void*)GetProcAddress(dll, "CurrentIP"); + return TRUE; + } + + return FALSE; +} + +static void test_CurrentIP(void) +{ + char *cur; + char *ret; + + cur = (char*)&test_CurrentIP; + ret = (char*)pCurrentIP(); + + ok(cur <= ret && ret < (cur + 0x100), "Address %p not in function starting at %p.\n", ret, cur); +} + +START_TEST(main) +{ + if (init_function_pointers()) + { + test_CurrentIP(); + FreeLibrary(dll); + } + else + skip("could not load wdscore.dll\n"); +} diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index 15958b86aba..8b6febe6b3b 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -71,7 +71,7 @@ @ stub ConstructPartialMsgIfW @ stub ConstructPartialMsgVA @ stub ConstructPartialMsgVW -@ stub CurrentIP +@ stdcall CurrentIP() @ stub EndMajorTask @ stub EndMinorTask @ stub GetMajorTask -- 2.35.0

5 16

[PATCH] wininet: Use CHAR_BIT from msvcrt limits.h.
by Zebediah Figura Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wininet/urlcache.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index d8b0d5fb037..22d0f5bf11d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -27,6 +27,7 @@ #include "ws2tcpip.h" +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -52,10 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); static const char urlcache_ver_prefix[] = "WINE URLCache Ver "; static const char urlcache_ver[] = "0.2012001"; -#ifndef CHAR_BIT -#define CHAR_BIT (8 * sizeof(CHAR)) -#endif - #define ENTRY_START_OFFSET 0x4000 #define DIR_LENGTH 8 #define MAX_DIR_NO 0x20 -- 2.34.1

1 0