- Wine-Devel - list.winehq.org

[PATCH v3] msado15: Some interface parts need a 64-bit type on amd64.
by Bernhard Übelacker Dec. 23, 2021

Dec. 23, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50842 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- Supersedes 222557. v3: Dropped the _WIN64 patch for widl and fixed definition of ADO_LONGPTR. Fixed a few resulting format string warnings. But the "warning: can't write value of type 20 yet" remains. v2: Missed some warnings about incompatible types. --- dlls/msado15/command.c | 4 +-- dlls/msado15/connection.c | 9 ++++++- dlls/msado15/recordset.c | 42 +++++++++++++++---------------- dlls/msado15/stream.c | 12 ++++----- dlls/msado15/tests/msado15.c | 45 +++++++++++++++++---------------- include/msado15_backcompat.idl | 46 +++++++++++++++++++--------------- 6 files changed, 87 insertions(+), 71 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 8c8ec79a58e..63ec9b23a01 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -234,10 +234,10 @@ static HRESULT WINAPI command_Execute( _Command *iface, VARIANT *affected, VARIA } static HRESULT WINAPI command_CreateParameter( _Command *iface, BSTR name, DataTypeEnum type, - ParameterDirectionEnum direction, LONG size, VARIANT value, + ParameterDirectionEnum direction, ADO_LONGPTR size, VARIANT value, _Parameter **parameter ) { - FIXME( "%p, %s, %d, %d, %d, %p\n", iface, debugstr_w(name), type, direction, size, parameter ); + FIXME( "%p, %s, %d, %d, %ld, %p\n", iface, debugstr_w(name), type, direction, size, parameter ); return E_NOTIMPL; } diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index ce7750fef66..1dfae0b7821 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -336,8 +336,15 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI if (records_affected) { + ADO_LONGPTR records_affected_lp; + _Recordset_get_RecordCount(recordset, &records_affected_lp); +#ifdef _WIN64 + V_VT(records_affected) = VT_I8; + V_I8(records_affected) = records_affected_lp; +#else V_VT(records_affected) = VT_I4; - _Recordset_get_RecordCount(recordset, &V_I4(records_affected)); + V_I4(records_affected) = records_affected_lp; +#endif } *record_set = recordset; diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 92a0deb6959..81098a31144 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -69,7 +69,7 @@ struct field LONG refs; WCHAR *name; DataTypeEnum type; - LONG defined_size; + ADO_LONGPTR defined_size; LONG attrs; LONG index; struct recordset *recordset; @@ -195,7 +195,7 @@ static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) return S_OK; } -static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) +static HRESULT WINAPI field_get_ActualSize( Field *iface, ADO_LONGPTR *size ) { FIXME( "%p, %p\n", iface, size ); return E_NOTIMPL; @@ -211,7 +211,7 @@ static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) return S_OK; } -static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) +static HRESULT WINAPI field_get_DefinedSize( Field *iface, ADO_LONGPTR *size ) { struct field *field = impl_from_Field( iface ); @@ -360,11 +360,11 @@ static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) return S_OK; } -static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) +static HRESULT WINAPI field_put_DefinedSize( Field *iface, ADO_LONGPTR size ) { struct field *field = impl_from_Field( iface ); - TRACE( "%p, %d\n", field, size ); + TRACE( "%p, %ld\n", field, size ); field->defined_size = size; return S_OK; @@ -829,11 +829,11 @@ static HRESULT append_field( struct fields *fields, BSTR name, DataTypeEnum type return S_OK; } -static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr ) +static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum type, ADO_LONGPTR size, FieldAttributeEnum attr ) { struct fields *fields = impl_from_Fields( iface ); - TRACE( "%p, %s, %u, %d, %d\n", fields, debugstr_w(name), type, size, attr ); + TRACE( "%p, %s, %u, %ld, %d\n", fields, debugstr_w(name), type, size, attr ); return append_field( fields, name, type, size, attr, NULL ); } @@ -844,12 +844,12 @@ static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index ) return E_NOTIMPL; } -static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr, +static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type, ADO_LONGPTR size, FieldAttributeEnum attr, VARIANT value ) { struct fields *fields = impl_from_Fields( iface ); - TRACE( "%p, %s, %u, %d, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); + TRACE( "%p, %s, %u, %ld, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); return append_field( fields, name, type, size, attr, &value ); } @@ -1290,19 +1290,19 @@ static HRESULT WINAPI recordset_put_LockType( _Recordset *iface, LockTypeEnum lo return E_NOTIMPL; } -static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, LONG *max_records ) +static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, ADO_LONGPTR *max_records ) { FIXME( "%p, %p\n", iface, max_records ); return E_NOTIMPL; } -static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, LONG max_records ) +static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, ADO_LONGPTR max_records ) { - FIXME( "%p, %d\n", iface, max_records ); + FIXME( "%p, %ld\n", iface, max_records ); return E_NOTIMPL; } -static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, LONG *count ) +static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, ADO_LONGPTR *count ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -1392,9 +1392,9 @@ static HRESULT WINAPI recordset_GetRows( _Recordset *iface, LONG rows, VARIANT s return E_NOTIMPL; } -static HRESULT WINAPI recordset_Move( _Recordset *iface, LONG num_records, VARIANT start ) +static HRESULT WINAPI recordset_Move( _Recordset *iface, ADO_LONGPTR num_records, VARIANT start ) { - FIXME( "%p, %d, %s\n", iface, num_records, debugstr_variant(&start) ); + FIXME( "%p, %ld, %s\n", iface, num_records, debugstr_variant(&start) ); return E_NOTIMPL; } @@ -1591,7 +1591,7 @@ static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria return E_NOTIMPL; } -static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, LONG *count ) +static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, ADO_LONGPTR *count ) { FIXME( "%p, %p\n", iface, count ); return E_NOTIMPL; @@ -1715,10 +1715,10 @@ static HRESULT WINAPI recordset_put_MarshalOptions( _Recordset *iface, MarshalOp return E_NOTIMPL; } -static HRESULT WINAPI recordset_Find( _Recordset *iface, BSTR criteria, LONG skip_records, +static HRESULT WINAPI recordset_Find( _Recordset *iface, BSTR criteria, ADO_LONGPTR skip_records, SearchDirectionEnum search_direction, VARIANT start ) { - FIXME( "%p, %s, %d, %d, %s\n", iface, debugstr_w(criteria), skip_records, search_direction, + FIXME( "%p, %s, %ld, %d, %s\n", iface, debugstr_w(criteria), skip_records, search_direction, debugstr_variant(&start) ); return E_NOTIMPL; } @@ -2061,17 +2061,17 @@ static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, return S_OK; } -static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) +static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, ADO_LONGPTR *chapter) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); FIXME( "%p, %p\n", recordset, chapter ); return E_NOTIMPL; } -static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, LONG chapter) +static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, ADO_LONGPTR chapter) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p, %d\n", recordset, chapter ); + FIXME( "%p, %ld\n", recordset, chapter ); return E_NOTIMPL; } diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 424ba722a26..ef5de1b74f8 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -144,7 +144,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, return hr; } -static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) +static HRESULT WINAPI stream_get_Size( _Stream *iface, ADO_LONGPTR *size ) { struct stream *stream = impl_from_Stream( iface ); TRACE( "%p, %p\n", stream, size ); @@ -166,7 +166,7 @@ static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) return S_OK; } -static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) +static HRESULT WINAPI stream_get_Position( _Stream *iface, ADO_LONGPTR *pos ) { struct stream *stream = impl_from_Stream( iface ); TRACE( "%p, %p\n", stream, pos ); @@ -191,12 +191,12 @@ static HRESULT resize_buffer( struct stream *stream, LONG size ) return S_OK; } -static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) +static HRESULT WINAPI stream_put_Position( _Stream *iface, ADO_LONGPTR pos ) { struct stream *stream = impl_from_Stream( iface ); HRESULT hr; - TRACE( "%p, %d\n", stream, pos ); + TRACE( "%p, %ld\n", stream, pos ); if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); if (pos < 0) return MAKE_ADO_HRESULT( adErrInvalidArgument ); @@ -406,9 +406,9 @@ static HRESULT WINAPI stream_SetEOS( _Stream *iface ) return resize_buffer( stream, stream->pos ); } -static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, LONG size ) +static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, ADO_LONGPTR size ) { - FIXME( "%p, %p, %d\n", iface, dst, size ); + FIXME( "%p, %p, %ld\n", iface, dst, size ); return E_NOTIMPL; } diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 25c9c6f8356..39d4fdd4727 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -53,6 +53,7 @@ static void test_Recordset(void) Properties *props; Property *prop; LONG count, state; + ADO_LONGPTR count_lp; VARIANT missing, val, index; CursorLocationEnum location; CursorTypeEnum cursor; @@ -212,20 +213,20 @@ static void test_Recordset(void) hr = _Recordset_put_Bookmark( recordset, bookmark ); ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); - count = -1; - hr = _Recordset_get_RecordCount( recordset, &count ); + count_lp = -1; + hr = _Recordset_get_RecordCount( recordset, &count_lp ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %d\n", count ); + ok( !count_lp, "got %ld\n", count_lp ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == S_OK, "got %08x\n", hr ); ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); - count = -1; - hr = _Recordset_get_RecordCount( recordset, &count ); + count_lp = -1; + hr = _Recordset_get_RecordCount( recordset, &count_lp ); ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 1, "got %d\n", count ); + ok( count_lp == 1, "got %ld\n", count_lp ); /* get_Fields still returns the same object */ hr = _Recordset_get_Fields( recordset, &fields2 ); @@ -631,7 +632,7 @@ static void test_ADORecordsetConstruction(void) if (count > 0) { VARIANT index; - LONG size; + ADO_LONGPTR size; DataTypeEnum type; V_VT( &index ) = VT_BSTR; @@ -646,7 +647,7 @@ static void test_ADORecordsetConstruction(void) size = -1; hr = Field_get_DefinedSize( field, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 5, "got %d\n", size ); + ok( size == 5, "got %ld\n", size ); VariantClear(&index); @@ -672,7 +673,8 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG count, size; + LONG count; + ADO_LONGPTR size; DataTypeEnum type; FieldAttributeEnum attrs; HRESULT hr; @@ -747,7 +749,7 @@ static void test_Fields(void) size = -1; hr = Field_get_DefinedSize( field, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 4, "got %d\n", size ); + ok( size == 4, "got %ld\n", size ); attrs = 0xdead; hr = Field_get_Attributes( field, &attrs ); ok( hr == S_OK, "got %08x\n", hr ); @@ -785,7 +787,8 @@ static void test_Stream(void) VARIANT_BOOL eos; StreamTypeEnum type; LineSeparatorEnum sep; - LONG refs, size, pos; + LONG refs; + ADO_LONGPTR size, pos; ObjectStateEnum state; ConnectModeEnum mode; BSTR charset, str; @@ -875,7 +878,7 @@ static void test_Stream(void) size = -1; hr = _Stream_get_Size( stream, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !size, "got %d\n", size ); + ok( !size, "got %ld\n", size ); eos = VARIANT_FALSE; hr = _Stream_get_EOS( stream, &eos ); @@ -885,12 +888,12 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !pos, "got %d\n", pos ); + ok( !pos, "got %ld\n", pos ); size = -1; hr = _Stream_get_Size( stream, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !size, "got %d\n", size ); + ok( !size, "got %ld\n", size ); hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); @@ -903,7 +906,7 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !pos, "got %d\n", pos ); + ok( !pos, "got %ld\n", pos ); str = SysAllocString( L"test" ); hr = _Stream_WriteText( stream, str, adWriteChar ); @@ -925,7 +928,7 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 10, "got %d\n", pos ); + ok( pos == 10, "got %ld\n", pos ); eos = VARIANT_FALSE; hr = _Stream_get_EOS( stream, &eos ); @@ -938,7 +941,7 @@ static void test_Stream(void) size = -1; hr = _Stream_get_Size( stream, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 10, "got %d\n", size ); + ok( size == 10, "got %ld\n", size ); hr = _Stream_put_Position( stream, 2 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -949,12 +952,12 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 2, "got %d\n", pos ); + ok( pos == 2, "got %ld\n", pos ); size = -1; hr = _Stream_get_Size( stream, &size ); ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 2, "got %d\n", size ); + ok( size == 2, "got %ld\n", size ); hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1006,7 +1009,7 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 4, "got %d\n", pos ); + ok( pos == 4, "got %ld\n", pos ); hr = _Stream_put_Position( stream, 0 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1020,7 +1023,7 @@ static void test_Stream(void) pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 4, "got %d\n", pos ); + ok( pos == 4, "got %ld\n", pos ); refs = _Stream_Release( stream ); ok( !refs, "got %d\n", refs ); diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index fedaf557066..a8e977430c0 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -125,7 +125,13 @@ typedef [uuid(00000528-0000-0010-8000-00aa006d2ea4)] enum PositionEnum adPosEOF = -3 } PositionEnum; +typedef LONG_PTR ADO_LONGPTR; + +cpp_quote("#ifdef _WIN64") +cpp_quote("typedef ADO_LONGPTR PositionEnum_Param;") +cpp_quote("#else") typedef [uuid(a56187c5-d690-4037-ae32-a00edc376ac3), public] PositionEnum PositionEnum_Param; +cpp_quote("#endif") typedef [uuid(0000051f-0000-0010-8000-00aa006d2ea4)] enum DataTypeEnum { @@ -626,7 +632,7 @@ interface Field20 : _ADO { [id(0x00000455), propget] HRESULT ActualSize( - [out, retval] LONG *size); + [out, retval] ADO_LONGPTR *size); [id(0x0000040c), propget] HRESULT Attributes( @@ -634,7 +640,7 @@ interface Field20 : _ADO [id(0x0000044f), propget] HRESULT DefinedSize( - [out, retval] LONG *size); + [out, retval] ADO_LONGPTR *size); [id(0x0000044c), propget] HRESULT Name( @@ -699,7 +705,7 @@ interface Field20 : _ADO [id(0x0000044f), propput] HRESULT DefinedSize( - [in] LONG size); + [in] ADO_LONGPTR size); [id(0x0000040c), propput] HRESULT Attributes( @@ -748,7 +754,7 @@ interface Fields20 : Fields15 HRESULT _Append( [in] BSTR name, [in] DataTypeEnum type, - [in, defaultvalue(0)] LONG size, + [in, defaultvalue(0)] ADO_LONGPTR size, [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr); [id(0x60030002)] @@ -769,7 +775,7 @@ interface Fields : Fields20 HRESULT Append( [in] BSTR name, [in] DataTypeEnum type, - [in, defaultvalue(0)] LONG size, + [in, defaultvalue(0)] ADO_LONGPTR size, [in, defaultvalue(adFldUnspecified)] FieldAttributeEnum attr, [in, optional] VARIANT value); @@ -859,15 +865,15 @@ interface Recordset15 : _ADO [id(0x000003f1), propget] HRESULT MaxRecords( - [out, retval] LONG *max_records); + [out, retval] ADO_LONGPTR *max_records); [id(0x000003f1), propput] HRESULT MaxRecords( - [in] LONG max_records); + [in] ADO_LONGPTR max_records); [id(0x000003f2), propget] HRESULT RecordCount( - [out, retval] LONG *count); + [out, retval] ADO_LONGPTR *count); [id(0x000003f3), propputref] HRESULT Source( @@ -905,7 +911,7 @@ interface Recordset15 : _ADO [id(0x000003f9)] HRESULT Move( - [in] LONG num_records, + [in] ADO_LONGPTR num_records, [in, optional] VARIANT start); [id(0x000003fa)] @@ -963,7 +969,7 @@ interface Recordset15 : _ADO [id(0x0000041a), propget] HRESULT PageCount( - [out, retval] LONG *count); + [out, retval] ADO_LONGPTR *count); [id(0x00000418), propget] HRESULT PageSize( @@ -1040,7 +1046,7 @@ interface Recordset15 : _ADO [id(0x00000422)] HRESULT Find( [in] BSTR criteria, - [in, defaultvalue(0)] LONG skip_records, + [in, defaultvalue(0)] ADO_LONGPTR skip_records, [in, defaultvalue(adSearchForward)] SearchDirectionEnum search_direction, [in, optional] VARIANT start); }; @@ -1408,11 +1414,11 @@ interface _Parameter : _ADO [id(0x6003000c), propput] HRESULT Size( - [in] LONG size); + [in] ADO_LONGPTR size); [id(0x6003000c), propget] HRESULT Size( - [out, retval] LONG *size); + [out, retval] ADO_LONGPTR *size); [id(0x6003000e)] HRESULT AppendChunk( @@ -1517,7 +1523,7 @@ interface Command15 : _ADO [in, defaultvalue("")] BSTR name, [in, defaultvalue(adEmpty)] DataTypeEnum type, [in, defaultvalue(adParamInput)] ParameterDirectionEnum direction, - [in, defaultvalue(0)] LONG size, + [in, defaultvalue(0)] ADO_LONGPTR size, [in, optional] VARIANT value, [out, retval] _Parameter **parameter); @@ -1844,7 +1850,7 @@ interface _Stream : IDispatch { [id(1), propget] HRESULT Size( - [out, retval] LONG *size); + [out, retval] ADO_LONGPTR *size); [id(2), propget] HRESULT EOS( @@ -1852,11 +1858,11 @@ interface _Stream : IDispatch [id(3), propget] HRESULT Position( - [out, retval] LONG *position); + [out, retval] ADO_LONGPTR *position); [id(3), propput] HRESULT Position( - [in] LONG position); + [in] ADO_LONGPTR position); [id(4), propget] HRESULT Type( @@ -1923,7 +1929,7 @@ interface _Stream : IDispatch [id(15)] HRESULT CopyTo( [in] _Stream *dest, - [in, defaultvalue(-1)] LONG size); + [in, defaultvalue(-1)] ADO_LONGPTR size); [id(16)] HRESULT Flush(void); @@ -2111,11 +2117,11 @@ interface ADORecordsetConstruction : IDispatch [propget] HRESULT Chapter( - [out, retval] LONG *chapter); + [out, retval] ADO_LONGPTR *chapter); [propput] HRESULT Chapter( - [in] LONG chapter); + [in] ADO_LONGPTR chapter); [propget] HRESULT RowPosition( -- 2.34.1

1 0

[PATCH] combase: Reorder hstring_private elements.
by Bernhard Kölbl Dec. 23, 2021

Dec. 23, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51017 Debugging sessions and the official WinRT SDK show, that the contained string is alligned at the end of the hstring_private struct and actually no reference counting is used. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/combase/string.c | 92 +++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 39 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 2092e4360a3..559a026fede 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -26,12 +26,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winstring); +#define HSTRING_REFERENCE_FLAG 1 + struct hstring_private { - LPWSTR buffer; + UINT32 flags; UINT32 length; - BOOL reference; - LONG refcount; + UINT32 padding1; + UINT32 padding2; + LPWSTR ptr; }; static const WCHAR empty[1]; @@ -40,30 +43,29 @@ C_ASSERT(sizeof(struct hstring_private) <= sizeof(HSTRING_HEADER)); static inline struct hstring_private *impl_from_HSTRING(HSTRING string) { - return (struct hstring_private *)string; + return (struct hstring_private *)string; } static inline struct hstring_private *impl_from_HSTRING_HEADER(HSTRING_HEADER *header) { - return (struct hstring_private *)header; + return (struct hstring_private *)header; } static inline struct hstring_private *impl_from_HSTRING_BUFFER(HSTRING_BUFFER buffer) { - return (struct hstring_private *)buffer; + return CONTAINING_RECORD(buffer, struct hstring_private, ptr); } static BOOL alloc_string(UINT32 len, HSTRING *out) { struct hstring_private *priv; - priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv) + (len + 1) * sizeof(*priv->buffer)); + priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); if (!priv) return FALSE; - priv->buffer = (LPWSTR)(priv + 1); + priv->ptr = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(*priv->ptr)); priv->length = len; - priv->reference = FALSE; - priv->refcount = 1; - priv->buffer[len] = '\0'; + priv->flags = 0; + priv->ptr[len] = '\0'; *out = (HSTRING)priv; return TRUE; } @@ -90,7 +92,7 @@ HRESULT WINAPI WindowsCreateString(LPCWSTR ptr, UINT32 len, if (!alloc_string(len, out)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(*out); - memcpy(priv->buffer, ptr, len * sizeof(*priv->buffer)); + memcpy(priv->ptr, ptr, len * sizeof(*priv->ptr)); return S_OK; } @@ -115,10 +117,10 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, } if (ptr == NULL) return E_POINTER; - priv->buffer = (LPWSTR)ptr; + priv->ptr = (LPWSTR)ptr; priv->length = len; - priv->reference = TRUE; - *out = (HSTRING)header; + priv->flags = TRUE; + *out = (HSTRING)priv; return S_OK; } @@ -127,16 +129,20 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, */ HRESULT WINAPI WindowsDeleteString(HSTRING str) { - struct hstring_private *priv = impl_from_HSTRING(str); + struct hstring_private *priv; TRACE("(%p)\n", str); if (str == NULL) return S_OK; - if (priv->reference) + + priv = impl_from_HSTRING(str); + + if(priv->flags == 0) return S_OK; - if (InterlockedDecrement(&priv->refcount) == 0) - HeapFree(GetProcessHeap(), 0, priv); + + HeapFree(GetProcessHeap(), 0, priv); + return S_OK; } @@ -156,9 +162,9 @@ HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) *out = NULL; return S_OK; } - if (priv->reference) - return WindowsCreateString(priv->buffer, priv->length, out); - InterlockedIncrement(&priv->refcount); + if (priv->flags == HSTRING_REFERENCE_FLAG) + return WindowsCreateString(priv->ptr, priv->length, out); + *out = str; return S_OK; } @@ -186,8 +192,8 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, if (!alloc_string(len, &str)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(str); - *outptr = priv->buffer; - *out = (HSTRING_BUFFER)str; + *outptr = priv->ptr; + *out = (HSTRING_BUFFER)&priv->ptr; return S_OK; } @@ -196,9 +202,17 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, */ HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf) { + + struct hstring_private *priv; + TRACE("(%p)\n", buf); - return WindowsDeleteString((HSTRING)buf); + if(buf) + priv = impl_from_HSTRING_BUFFER(buf); + else + priv = NULL; + + return WindowsDeleteString((HSTRING)priv); } /*********************************************************************** @@ -217,9 +231,9 @@ HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out) *out = NULL; return S_OK; } - if (priv->buffer[priv->length] != 0 || priv->reference || priv->refcount != 1) + if (priv->ptr[priv->length] != 0 || priv->flags == HSTRING_REFERENCE_FLAG) return E_INVALIDARG; - *out = (HSTRING)buf; + *out = (HSTRING)priv; return S_OK; } @@ -254,7 +268,7 @@ LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len) } if (len) *len = priv->length; - return priv->buffer; + return priv->ptr; } /*********************************************************************** @@ -276,7 +290,7 @@ HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) } for (i = 0; i < priv->length; i++) { - if (priv->buffer[i] == '\0') + if (priv->ptr[i] == '\0') { *out = TRUE; return S_OK; @@ -305,7 +319,7 @@ HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len - start, out); + return WindowsCreateString(&priv->ptr[start], len - start, out); } /*********************************************************************** @@ -327,7 +341,7 @@ HRESULT WINAPI WindowsSubstringWithSpecifiedLength(HSTRING str, UINT32 start, UI *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len, out); + return WindowsCreateString(&priv->ptr[start], len, out); } /*********************************************************************** @@ -355,8 +369,8 @@ HRESULT WINAPI WindowsConcatString(HSTRING str1, HSTRING str2, HSTRING *out) if (!alloc_string(priv1->length + priv2->length, out)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(*out); - memcpy(priv->buffer, priv1->buffer, priv1->length * sizeof(*priv1->buffer)); - memcpy(priv->buffer + priv1->length, priv2->buffer, priv2->length * sizeof(*priv2->buffer)); + memcpy(priv->ptr, priv1->ptr, priv1->length * sizeof(*priv1->ptr)); + memcpy(priv->ptr + priv1->length, priv2->ptr, priv2->length * sizeof(*priv2->ptr)); return S_OK; } @@ -395,12 +409,12 @@ HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING str1, HSTRING str2, INT32 *re } if (str1) { - buf1 = priv1->buffer; + buf1 = priv1->ptr; len1 = priv1->length; } if (str2) { - buf2 = priv2->buffer; + buf2 = priv2->ptr; len2 = priv2->length; } *res = CompareStringOrdinal(buf1, len1, buf2, len2, FALSE) - CSTR_EQUAL; @@ -427,10 +441,10 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out) } for (start = 0; start < priv1->length; start++) { - if (!wmemchr(priv2->buffer, priv1->buffer[start], priv2->length)) + if (!wmemchr(priv2->ptr, priv1->ptr[start], priv2->length)) break; } - return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : + return start ? WindowsCreateString(&priv1->ptr[start], priv1->length - start, out) : WindowsDuplicateString(str1, out); } @@ -454,9 +468,9 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING str1, HSTRING str2, HSTRING *out) } for (len = priv1->length; len > 0; len--) { - if (!wmemchr(priv2->buffer, priv1->buffer[len - 1], priv2->length)) + if (!wmemchr(priv2->ptr, priv1->ptr[len - 1], priv2->length)) break; } - return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) : + return (len < priv1->length) ? WindowsCreateString(priv1->ptr, len, out) : WindowsDuplicateString(str1, out); } -- 2.34.1

1 0

[PATCH] msvcrt: Fix restoring 53-bit precision mode in _control87.
by Piotr Caban Dec. 23, 2021

Dec. 23, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52260 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tools] testbot/SetWinLocale: Add an option to show the current locale settings.
by Francois Gouget Dec. 23, 2021

Dec. 23, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 139 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 4 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 0ab7f935d2..4f50ed555c 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -41,6 +41,13 @@ use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; +my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; +my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; +my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; +my $HKCU_DESKTOP = "HKCU\\Control Panel\\Desktop"; +my $HKLM_LANGUAGE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Language"; +my $HKLM_LOCALE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale"; + # # Error handling and logging @@ -289,7 +296,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptReboot); +my ($OptHostName, $OptShow, $OptReboot); my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); while (@ARGV) { @@ -298,6 +305,10 @@ while (@ARGV) { $Usage = 0; } + elsif ($Arg eq "--show") + { + $OptShow = 1; + } elsif ($Arg eq "--reboot") { if (defined $OptReboot and !$OptReboot) @@ -414,7 +425,7 @@ if (!defined $Usage) } if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and - !$OptCountry) + !$OptCountry and !$OptShow) { Error("you must specify at least one locale to change\n"); $Usage = 2; @@ -433,12 +444,14 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } + print "or $name0 [options] --show HOSTNAME\n"; print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; + print " --show Show the locale settings of the specified host and exit.\n"; print " --default LOC Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; @@ -474,6 +487,126 @@ if (defined $Usage) exit 0; } +my $TA = TestAgent->new($OptHostName, $AgentPort); + + +# +# Registry helpers +# + +sub RegGetValues($;$) +{ + my ($Key, $VName) = @_; + + my $Cmd = ["reg.exe", "query", $Key]; + if ($VName) + { + push @$Cmd, ($VName =~ /\*/ ? "/f" : "/v"), $VName; + } + else + { + push @$Cmd, "/ve"; + } + + my $Pid = $TA->Run($Cmd, 0, undef, "reg.out"); + if (!$Pid) + { + FatalError("failed to run @$Cmd\n"); + } + if (!defined $TA->Wait($Pid, 10)) + { + FatalError("@$Cmd timed out: ", $TA->GetLastError(), "\n"); + } + my $RegOut = $TA->GetFileToString("reg.out"); + $TA->Rm("reg.out"); + + my $Values = {}; + foreach my $Line (split /\n/, $RegOut) + { + if ($Line =~ /^\s{4}(.*)\s{4}REG_[A-Z_]+\s{4}(.*)\r$/) + { + my ($VName, $Value) = ($1, $2); + $Value = [split /\\0/, $Value] if ($Value =~ /\\0/); + $Values->{$VName} = $Value; + } + } + return $Values; +} + +sub RegGetValue($;$) +{ + my ($Key, $VName) = @_; + my $Values = RegGetValues($Key, $VName); + return $Values->{defined $VName ? $VName : "(Default)"}; +} + + +# +# Show the host's locale settings +# + +sub GetWinSettings($) +{ + my ($All) = @_; + my $Settings; + + if ($OptLocale or $All) + { + my $Values = RegGetValues($HKCU_INTERNATIONAL, "Locale*"); + map { $Settings->{$_} = $Values->{$_} } ("Locale", "LocaleName"); + } + if ($OptCountry or $All) + { + my $Values = RegGetValues($HKCU_GEO, "N*"); + $Settings->{Country} = $Values->{Nation}; + $Settings->{CountryName} = $Values->{Name}; + } + if ($OptKeyboard or $All) + { + $Settings->{InputMethod} = RegGetValue($HKCU_USER_PROFILE, "InputMethodOverride"); + } + if ($OptMUI or $All) + { + my $Values = RegGetValues($HKCU_DESKTOP, "*PreferredUILanguages*"); + map { $Settings->{$_} = $Values->{$_} } ("PreferredUILanguages", "PreferredUILanguagesPending", "PreviousPreferredUILanguages"); + } + if ($OptSystem or $All) + { + $Settings->{SysLanguage} = RegGetValue($HKLM_LANGUAGE, "Default"); + $Settings->{SysLocale} = RegGetValue($HKLM_LOCALE, "(Default)"); + } + return $Settings; +} + +sub Value2Str($) +{ + my ($Value) = @_; + return !defined $Value ? "<undef>" : + ref($Value) ne "ARRAY" ? $Value : + ("[". join(", ", @$Value) ."]"); +} + +sub ShowWinSettings($) +{ + my ($Settings) = @_; + print "Locale (--locale) = ", Value2Str($Settings->{Locale}), "\n"; + print "LocaleName (--locale) = ", Value2Str($Settings->{LocaleName}), "\n"; + print "Geo:Nation (--country) = ", Value2Str($Settings->{Country}), "\n"; + print "Geo:Name (--country) = ", Value2Str($Settings->{CountryName}), "\n"; + print "InputMethod (--keyboard) = ", Value2Str($Settings->{InputMethod}), "\n"; + print "PreferredUILanguages (--mui) = ", Value2Str($Settings->{PreferredUILanguages}), "\n"; + print " ...Pending (--mui) = ", Value2Str($Settings->{PreferredUILanguagesPending}), "\n"; + print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; + print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; + print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; +} + +if ($OptShow) +{ + ShowWinSettings(GetWinSettings("all")); + exit(0); +} + # # Generate the intl.cpl configuration @@ -526,8 +659,6 @@ push @Config, "</gs:GlobalizationServices>"; # Change the Windows locale using intl.cpl # -my $TA = TestAgent->new($OptHostName, $AgentPort); - Debug(Elapsed($Start), " Sending the configuration file\n"); print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Fix a typo in the usage message.
by Francois Gouget Dec. 23, 2021

Dec. 23, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 2de673360f..0ab7f935d2 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -447,7 +447,7 @@ if (defined $Usage) print " --locale USR Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; - print " . APIs: UserDefaultLCID(), GetThreadLocale().\n"; + print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; -- 2.30.2

1 0

[PATCH v2] faudio: Return PCM format from IXAudio27_GetDeviceDetails.
by Rémi Bernon Dec. 23, 2021

Dec. 23, 2021

This will be in next FAudio release. This fixes a regression in some games, such as Far Cry 4, where audio doesn't work anymore since the move to FAudio Win32 platform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Only pick the format change, remove the corresponding todo_wine. dlls/xaudio2_7/tests/xaudio2.c | 1 - libs/faudio/src/FAudio_platform_win32.c | 27 ++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index ea7e2ec121a..9821553166e 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -940,7 +940,6 @@ static UINT32 test_DeviceDetails(IXAudio27 *xa) else ok(dd.Role == NotDefaultDevice, "Got wrong role for index %u: 0x%x\n", i, dd.Role); - todo_wine ok(IsEqualGUID(&dd.OutputFormat.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), "got format %s\n", debugstr_guid(&dd.OutputFormat.SubFormat)); } diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index ccb8d8abbbf..d99bae044a4 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -364,13 +364,14 @@ uint32_t FAudio_PlatformGetDeviceDetails( uint32_t index, FAudioDeviceDetails *details ) { + WAVEFORMATEX *format, *obtained; WAVEFORMATEXTENSIBLE *ext; - WAVEFORMATEX *format; IAudioClient *client; IMMDevice *device; uint32_t ret = 0; HRESULT hr; WCHAR *str; + GUID sub; FAudio_memset(details, 0, sizeof(FAudioDeviceDetails)); if (index > 0) return FAUDIO_E_INVALID_CALL; @@ -406,6 +407,28 @@ uint32_t FAudio_PlatformGetDeviceDetails( hr = IAudioClient_GetMixFormat(client, &format); FAudio_assert(!FAILED(hr) && "Failed to get audio client mix format!"); + if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + ext = (WAVEFORMATEXTENSIBLE *)format; + sub = ext->SubFormat; + FAudio_memcpy( + &ext->SubFormat, + &DATAFORMAT_SUBTYPE_PCM, + sizeof(GUID) + ); + + hr = IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, format, &obtained); + if (FAILED(hr)) + { + ext->SubFormat = sub; + } + else if (obtained) + { + CoTaskMemFree(format); + format = obtained; + } + } + details->OutputFormat.Format.wFormatTag = format->wFormatTag; details->OutputFormat.Format.nChannels = format->nChannels; details->OutputFormat.Format.nSamplesPerSec = format->nSamplesPerSec; @@ -426,6 +449,8 @@ uint32_t FAudio_PlatformGetDeviceDetails( ); } + CoTaskMemFree(format); + IAudioClient_Release(client); IMMDevice_Release(device); -- 2.34.1

1 0

[PATCH v2 1/2] widl: Define _WIN64 for 64-bit targets.
by Bernhard Übelacker Dec. 23, 2021

Dec. 23, 2021

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- Supersedes 222554. v2: No changes. --- tools/widl/widl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0b5f07236f0..d241e046846 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -849,6 +849,8 @@ int main(int argc,char *argv[]) add_widl_version_define(); wpp_add_cmdline_define("_WIN32=1"); + if (pointer_size == 8) + wpp_add_cmdline_define("_WIN64=1"); atexit(rm_tempfile); if (!no_preprocess) -- 2.34.1

3 8

[PATCH] faudio: Update to 21.12-3-gbbc9519.
by Rémi Bernon Dec. 23, 2021

Dec. 23, 2021

This will be in next FAudio release. The PCM format change is required to fix a regression in some games, such as Far Cry 4, where audio doesn't work anymore since the move to FAudio Win32 platform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I believe FAudio uses monthly releases, which may be late for Wine 7.0, depending on our release schedule. We can also wait for FAudio 22.01 otherwise. libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FAudio_platform_win32.c | 75 ++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 6f68013d79f..3d2ea4afdcd 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 21 -#define FAUDIO_MINOR_VERSION 11 +#define FAUDIO_MINOR_VERSION 12 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index ccb8d8abbbf..89101a6cf7a 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -70,6 +70,44 @@ void FAudio_Log(char const *msg) OutputDebugStringA(msg); } +static HMODULE kernelbase = NULL; +static HRESULT (WINAPI *my_SetThreadDescription)(HANDLE, PCWSTR) = NULL; + +static void FAudio_resolve_SetThreadDescription(void) +{ + kernelbase = LoadLibraryA("kernelbase.dll"); + if (!kernelbase) + return; + + my_SetThreadDescription = (HRESULT (WINAPI *)(HANDLE, PCWSTR)) GetProcAddress(kernelbase, "SetThreadDescription"); + if (!my_SetThreadDescription) + { + FreeLibrary(kernelbase); + kernelbase = NULL; + } +} + +static void FAudio_set_thread_name(char const *name) +{ + int ret; + WCHAR *nameW; + + if (!my_SetThreadDescription) + return; + + ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0); + + nameW = FAudio_malloc(ret * sizeof(WCHAR)); + if (!nameW) + return; + + ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, nameW, ret); + if (ret) + my_SetThreadDescription(GetCurrentThread(), nameW); + + FAudio_free(nameW); +} + static HRESULT FAudio_FillAudioClientBuffer( struct FAudioAudioClientThreadArgs *args, IAudioRenderClient *client, @@ -121,6 +159,8 @@ static DWORD WINAPI FAudio_AudioClientThread(void *user) HRESULT hr = S_OK; UINT frames, padding = 0; + FAudio_set_thread_name(__func__); + hr = IAudioClient_GetService( args->client, &IID_IAudioRenderClient, @@ -172,6 +212,7 @@ void FAudio_PlatformInit( BOOL has_sse2 = IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE); FAudio_INTERNAL_InitSIMDFunctions(has_sse2, FALSE); + FAudio_resolve_SetThreadDescription(); FAudio_PlatformAddRef(); @@ -305,6 +346,12 @@ void FAudio_PlatformQuit(void* platformDevice) SetEvent(data->stopEvent); WaitForSingleObject(data->audioThread, INFINITE); if (data->client) IAudioClient_Release(data->client); + if (kernelbase) + { + my_SetThreadDescription = NULL; + FreeLibrary(kernelbase); + kernelbase = NULL; + } FAudio_PlatformRelease(); } @@ -364,13 +411,14 @@ uint32_t FAudio_PlatformGetDeviceDetails( uint32_t index, FAudioDeviceDetails *details ) { + WAVEFORMATEX *format, *obtained; WAVEFORMATEXTENSIBLE *ext; - WAVEFORMATEX *format; IAudioClient *client; IMMDevice *device; uint32_t ret = 0; HRESULT hr; WCHAR *str; + GUID sub; FAudio_memset(details, 0, sizeof(FAudioDeviceDetails)); if (index > 0) return FAUDIO_E_INVALID_CALL; @@ -406,6 +454,28 @@ uint32_t FAudio_PlatformGetDeviceDetails( hr = IAudioClient_GetMixFormat(client, &format); FAudio_assert(!FAILED(hr) && "Failed to get audio client mix format!"); + if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + ext = (WAVEFORMATEXTENSIBLE *)format; + sub = ext->SubFormat; + FAudio_memcpy( + &ext->SubFormat, + &DATAFORMAT_SUBTYPE_PCM, + sizeof(GUID) + ); + + hr = IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, format, &obtained); + if (FAILED(hr)) + { + ext->SubFormat = sub; + } + else if (obtained) + { + CoTaskMemFree(format); + format = obtained; + } + } + details->OutputFormat.Format.wFormatTag = format->wFormatTag; details->OutputFormat.Format.nChannels = format->nChannels; details->OutputFormat.Format.nSamplesPerSec = format->nSamplesPerSec; @@ -426,6 +496,8 @@ uint32_t FAudio_PlatformGetDeviceDetails( ); } + CoTaskMemFree(format); + IAudioClient_Release(client); IMMDevice_Release(device); @@ -475,6 +547,7 @@ static DWORD WINAPI FaudioThreadWrapper(void *user) struct FAudioThreadArgs *args = user; DWORD ret; + FAudio_set_thread_name(args->name); ret = args->func(args->data); FAudio_free(args); -- 2.34.1

2 1

[PATCH v8 1/3] ntdll: sock_recv keeps message ordered
by Dongwan Kim Dec. 23, 2021

Dec. 23, 2021

Calling try_recv could make messages misordered. Suppose that a server program calls a overlapped WSARecv and its operation is pending. Another program sends a message and wineserver is busy. The server program calls another overlapped WSARecv and it intercepts the message for the pending WSARecv. The problem already had been discussed here https://www.winehq.org/pipermail/wine-devel/2021-May/186612.html To avoid this situation, this kind of approach can be applied. The server program needs to know if there are pending asyncs before calling try_recv. Wineserver notifies it whenever invoking APC_ASYNC_IO. Then, the server program updates it and check it before calling try_recv. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ntdll/unix/server.c | 8 ++++---- dlls/ntdll/unix/socket.c | 26 +++++++++++++++++++++++++- dlls/ws2_32/socket.c | 28 ++++++++++++++++++++++++++++ include/wine/afd.h | 12 +++++++++++- include/wine/server_protocol.h | 1 + server/async.c | 8 ++++++++ 6 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a388247beb2..047da6e0974 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -368,17 +368,17 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO case APC_ASYNC_IO: { struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); - ULONG_PTR info = call->async_io.result; + ULONG_PTR info[2] = { call->async_io.result, call->async_io.async_wait }; NTSTATUS status; result->type = call->type; status = call->async_io.status; - if (user->callback( user, &info, &status )) + if (user->callback( user, info, &status )) { result->async_io.status = status; - result->async_io.total = info; + result->async_io.total = *info; /* the server will pass us NULL if a call failed synchronously */ - set_async_iosb( call->async_io.sb, result->async_io.status, info ); + set_async_iosb( call->async_io.sb, result->async_io.status, *info ); } else result->async_io.status = STATUS_PENDING; /* restart it */ break; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f82c7ae1ddf..a76def8b9c6 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -651,13 +651,28 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz return status; } +struct list *async_queue_list; +static struct afd_async_queue* find_async_queue(HANDLE handle){ + struct afd_async_queue *queue; + + LIST_FOR_EACH_ENTRY(queue, async_queue_list, struct afd_async_queue, entry){ + if(queue->sock == handle) + return queue; + } + return NULL; +} static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) { struct async_recv_ioctl *async = user; + struct afd_async_queue *queue; int fd, needs_close; TRACE( "%#x\n", *status ); + queue = find_async_queue(async->io.handle); + if( queue ) + queue->read_q = info[1]; //store if waiting asyncs exist + if (*status == STATUS_ALERTED) { if ((*status = server_get_unix_fd( async->io.handle, 0, &fd, &needs_close, NULL, NULL ))) @@ -679,6 +694,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi struct WS_sockaddr *addr, int *addr_len, DWORD *ret_flags, int unix_flags, int force_async ) { struct async_recv_ioctl *async; + struct afd_async_queue *queue; ULONG_PTR information; HANDLE wait_handle; DWORD async_size; @@ -735,7 +751,12 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } } - status = try_recv( fd, async, &information ); + queue = find_async_queue(handle); + + if( force_async && queue->read_q ) // if there are waiting asyncs, avoid cutting in line. + status = STATUS_DEVICE_NOT_READY; + else + status = try_recv( fd, async, &information ); if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW && status != STATUS_DEVICE_NOT_READY) { @@ -764,6 +785,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_END_REQ; if (status != STATUS_PENDING) release_fileio( &async->io ); + else queue->read_q = 1; if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; @@ -1306,6 +1328,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc unsigned int *ws_flags = u64_to_user_ptr(params->ws_flags_ptr); int unix_flags = 0; + async_queue_list = u64_to_user_ptr(params->async_queue_list); + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) return status; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 648284c10a3..88e0b00cb51 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -157,6 +157,30 @@ DECLARE_CRITICAL_SECTION(cs_socket_list); static SOCKET *socket_list; static unsigned int socket_list_size; +struct list async_queue_list = LIST_INIT(async_queue_list); + +static struct afd_async_queue* alloc_async_queue(HANDLE handle){ + struct afd_async_queue *queue = + (struct afd_async_queue*)malloc(sizeof(struct afd_async_queue)); + memset(queue, 0, sizeof(struct afd_async_queue)); + + queue->sock = handle; + list_add_head(&async_queue_list, &queue->entry); + return queue; +} + +static void remove_async_queue(HANDLE handle){ + struct afd_async_queue *queue; + + LIST_FOR_EACH_ENTRY(queue, &async_queue_list, struct afd_async_queue, entry){ + if(queue->sock == handle){ + list_remove(&queue->entry); + free(queue); + break; + } + } +} + const char *debugstr_sockaddr( const struct sockaddr *a ) { if (!a) return "(nil)"; @@ -355,6 +379,8 @@ static BOOL socket_list_add(SOCKET socket) SOCKET *new_array; EnterCriticalSection(&cs_socket_list); + alloc_async_queue((HANDLE)socket); + for (i = 0; i < socket_list_size; ++i) { if (!socket_list[i]) @@ -406,6 +432,7 @@ static BOOL socket_list_remove( SOCKET socket ) if (!socket) return FALSE; EnterCriticalSection(&cs_socket_list); + remove_async_queue( (HANDLE)socket); for (i = 0; i < socket_list_size; ++i) { if (socket_list[i] == socket) @@ -938,6 +965,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * params.force_async = !!overlapped; params.count = buffer_count; params.buffers_ptr = u64_from_user_ptr(buffers); + params.async_queue_list = u64_from_user_ptr(&async_queue_list); status = NtDeviceIoControlFile( (HANDLE)s, event, apc, cvalue, piosb, IOCTL_AFD_WINE_RECVMSG, &params, sizeof(params), NULL, 0 ); diff --git a/include/wine/afd.h b/include/wine/afd.h index efd5787e90a..c4ece63138a 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,6 +24,7 @@ #include <winternl.h> #include <winioctl.h> #include <mswsock.h> +#include "wine/list.h" struct afd_wsabuf_32 { @@ -322,8 +323,9 @@ struct afd_recvmsg_params int force_async; unsigned int count; ULONGLONG buffers_ptr; /* WSABUF[] */ + ULONGLONG async_queue_list; }; -C_ASSERT( sizeof(struct afd_recvmsg_params) == 48 ); +C_ASSERT( sizeof(struct afd_recvmsg_params) == 56 ); struct afd_sendmsg_params { @@ -365,4 +367,12 @@ struct afd_get_info_params }; C_ASSERT( sizeof(struct afd_get_info_params) == 12 ); +struct afd_async_queue{ + struct list entry; + HANDLE sock; + char read_q; + char write_q; +}; + + #endif diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1d17a40530f..ce26240bc9a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -492,6 +492,7 @@ typedef union client_ptr_t user; client_ptr_t sb; data_size_t result; + unsigned int async_wait; } async_io; struct { diff --git a/server/async.c b/server/async.c index 1a564ff1a69..5d6cc9770c3 100644 --- a/server/async.c +++ b/server/async.c @@ -164,6 +164,7 @@ static void async_destroy( struct object *obj ) void async_terminate( struct async *async, unsigned int status ) { struct iosb *iosb = async->iosb; + struct async* async_waiting; if (async->terminated) return; @@ -202,6 +203,13 @@ void async_terminate( struct async *async, unsigned int status ) else data.async_io.status = status; + async_waiting = find_pending_async(async->queue); + if(async_waiting) + { + data.async_io.async_wait = 1; + release_object(async_waiting); + } + thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); } -- 2.30.2

2 4

[PATCH] crypt32/tests: Make pfxdata static
by Alex Henrie Dec. 23, 2021

Dec. 23, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/crypt32/tests/store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 46c9102686d..852cedaa1fe 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3038,7 +3038,7 @@ static void test_I_UpdateStore(void) CertCloseStore(store2, 0); } -const BYTE pfxdata[] = +static const BYTE pfxdata[] = { 0x30, 0x82, 0x0b, 0x1d, 0x02, 0x01, 0x03, 0x30, 0x82, 0x0a, 0xe3, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, -- 2.34.1

1 0