February 2022 - Wine-Commits

Eric Pouech : dwrite/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 097191926a99bcd4f1c8026c2922c6f80d9f9684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=097191926a99bcd4f1c8026c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:07:57 2022 +0100 dwrite/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 10722fee444..bb70c6f2320 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8697,7 +8697,7 @@ static void test_ComputeGlyphOrigins(void) ok(hr == S_OK, "%u: failed to compute glyph origins, hr %#x.\n", i, hr); for (j = 0; j < run.glyphCount; ++j) { - todo_wine_if(run.isSideways) + todo_wine_if(run.isSideways) ok(!memcmp(&origins[j], &expected_origins[j], sizeof(origins[j])), "%u: unexpected origin[%u] (%f, %f) - (%f, %f).\n", i, j, origins[j].x, origins[j].y, expected_origins[j].x, expected_origins[j].y); @@ -9778,7 +9778,7 @@ static void test_fontsetbuilder(void) if (id == DWRITE_FONT_PROPERTY_ID_WEIGHT || id == DWRITE_FONT_PROPERTY_ID_STRETCH || id == DWRITE_FONT_PROPERTY_ID_STYLE) { - todo_wine + todo_wine ok(exists, "Property %u expected to exist.\n", id); }

1 0

Bernhard Kölbl : include: Add missing required iface and retval for IMapView<K, V>.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: ca9df81035c18b1a1a3584a7fcad72401bae7463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9df81035c18b1a1a3584a7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Feb 21 19:38:56 2022 +0100 include: Add missing required iface and retval for IMapView<K, V>. In windows.foundation.collections.idl. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 35 ++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index a2d2d75ec4f..d69c27f6bbd 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -74,18 +74,6 @@ cpp_quote("#endif") namespace Collections { - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(e480ce40-a338-4ada-adcf-272272e48cb9) - ] - interface IMapView<K, V> : IInspectable - { - HRESULT Lookup([in] K key, [out] V *value); - [propget] HRESULT Size([out] unsigned int *size); - HRESULT HasKey([in] K key, [out] boolean *found); - HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second); - } - [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(6a79e863-4300-459a-9966-cbb660963ee1) @@ -107,6 +95,29 @@ cpp_quote("#endif") HRESULT First([out, retval] Windows.Foundation.Collections.IIterator<T> **value); } + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(02b51929-c1c4-4a7e-8940-0312b5c18500) + ] + interface IKeyValuePair<K, V> : IInspectable + { + [propget] HRESULT Key([out, retval] K *key); + [propget] HRESULT Value([out, retval] V *value); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(e480ce40-a338-4ada-adcf-272272e48cb9) + ] + interface IMapView<K, V> : IInspectable + requires IIterable<IKeyValuePair<K, V> *> + { + HRESULT Lookup([in] K key, [out, retval] V *value); + [propget] HRESULT Size([out, retval] unsigned int *size); + HRESULT HasKey([in] K key, [out, retval] boolean *found); + HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56)

1 0

Rémi Bernon : widl: Support declaring multiple namespaces at once.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 3e16b374755a2bfa051f602aa4698c1a7d53d8da URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e16b374755a2bfa051f602a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 21 19:52:45 2022 +0100 widl: Support declaring multiple namespaces at once. Using the namespace A.B.C {} syntax, used in a few some places in WinRT IDLs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9b71cbedf6d..93f7b0f52b9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -70,8 +70,8 @@ static struct namespace *find_namespace_or_error(struct namespace *namespace, co static var_t *reg_const(var_t *var); -static void push_namespace(const char *name); -static void pop_namespace(const char *name); +static void push_namespaces(str_list_t *names); +static void pop_namespaces(str_list_t *names); static void push_parameters_namespace(const char *name); static void pop_parameters_namespace(const char *name); @@ -293,7 +293,7 @@ static typelib_t *current_typelib; %type <type> dispinterfaceref %type <type> dispinterface dispinterfacedef %type <type> module moduledef -%type <str> namespacedef +%type <str_list> namespacedef %type <type> base_type int_std %type <type> enumdef structdef uniondef typedecl %type <type> type unqualified_type qualified_type @@ -385,8 +385,8 @@ imp_decl_statements: { $$ = NULL; } imp_decl_block: tDECLARE '{' imp_decl_statements '}' { $$ = $3; } gbl_statements: { $$ = NULL; } - | gbl_statements namespacedef '{' { push_namespace($2); } gbl_statements '}' - { pop_namespace($2); $$ = append_statements($1, $5); } + | gbl_statements namespacedef '{' { push_namespaces($2); } gbl_statements '}' + { pop_namespaces($2); $$ = append_statements($1, $5); } | gbl_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); } | gbl_statements dispinterface ';' { $$ = append_statement($1, make_statement_reference($2)); } | gbl_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } @@ -412,8 +412,8 @@ gbl_statements: { $$ = NULL; } imp_statements: { $$ = NULL; } | imp_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); } | imp_statements dispinterface ';' { $$ = append_statement($1, make_statement_reference($2)); } - | imp_statements namespacedef '{' { push_namespace($2); } imp_statements '}' - { pop_namespace($2); $$ = append_statements($1, $5); } + | imp_statements namespacedef '{' { push_namespaces($2); } imp_statements '}' + { pop_namespaces($2); $$ = append_statements($1, $5); } | imp_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } | imp_statements delegatedef { $$ = append_statement($1, make_statement_type_decl($2)); } | imp_statements coclass ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); } @@ -992,7 +992,8 @@ apicontract_def: attributes apicontract '{' '}' semicolon_opt { $$ = type_apicontract_define($2, $1); } ; -namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } +namespacedef: tNAMESPACE aIDENTIFIER { $$ = append_str( NULL, $2 ); } + | namespacedef '.' aIDENTIFIER { $$ = append_str( $1, $3 ); } ; class_interfaces: { $$ = NULL; } @@ -2041,6 +2042,20 @@ static void pop_namespace(const char *name) current_namespace = current_namespace->parent; } +static void push_namespaces(str_list_t *names) +{ + const struct str_list_entry_t *name; + LIST_FOR_EACH_ENTRY(name, names, const struct str_list_entry_t, entry) + push_namespace(name->str); +} + +static void pop_namespaces(str_list_t *names) +{ + const struct str_list_entry_t *name; + LIST_FOR_EACH_ENTRY_REV(name, names, const struct str_list_entry_t, entry) + pop_namespace(name->str); +} + static void push_parameters_namespace(const char *name) { struct namespace *namespace;

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.IRawGameController2 definition.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 167ae41b5dbcac9f5353f5f0bf1aaad5e76d1325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=167ae41b5dbcac9f5353f5f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 21 19:52:48 2022 +0100 include: Add Windows.Gaming.Input.IRawGameController2 definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index ccc29922eb8..82b810ddbdd 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -25,6 +25,7 @@ import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; +import "windows.devices.haptics.idl"; import "windows.gaming.input.forcefeedback.idl"; import "windows.system.idl"; @@ -260,6 +261,20 @@ namespace Windows.Gaming.Input { HRESULT GetSwitchKind([in] INT32 index, [out, retval] Windows.Gaming.Input.GameControllerSwitchKind *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.Gaming.Input.RawGameController), + uuid(43c0c035-bb73-4756-a787-3ed6bea617bd) + ] + interface IRawGameController2 : IInspectable + requires Windows.Gaming.Input.IRawGameController, + Windows.Gaming.Input.IGameController + { + [propget] HRESULT SimpleHapticsControllers([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Devices.Haptics.SimpleHapticsController *> **value); + [propget] HRESULT NonRoamableId([out, retval] HSTRING *value); + [propget] HRESULT DisplayName([out, retval] HSTRING *value); + } + [ object, uuid(8bbce529-d49c-39e9-9560-e47dde96b7c8)

1 0

Zebediah Figura : winegstreamer: Manually send new segment events.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: f7a5bf7be1b43ff295723c15c296c94321e3a653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7a5bf7be1b43ff295723c15… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 21 23:13:20 2022 -0600 winegstreamer: Manually send new segment events. Instead of translating them from GST_EVENT_SEGMENT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index e06c55ccfe0..eab94aca004 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -75,6 +75,12 @@ struct parser_source CRITICAL_SECTION flushing_cs; HANDLE thread; + + /* This variable is read and written by both the streaming thread and + * application threads. However, it is only written by the application + * thread when the streaming thread is not running, or when it is blocked + * by flushing_cs. */ + bool need_segment; }; static inline struct parser *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -750,6 +756,14 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event HRESULT hr; IMediaSample *sample; + if (pin->need_segment) + { + if (FAILED(hr = IPin_NewSegment(pin->pin.pin.peer, + pin->seek.llCurrent, pin->seek.llStop, pin->seek.dRate))) + WARN("Failed to deliver new segment, hr %#lx.\n", hr); + pin->need_segment = false; + } + if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM) || IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_IEEE_FLOAT))) @@ -828,8 +842,6 @@ static DWORD CALLBACK stream_thread(void *arg) break; case WG_PARSER_EVENT_SEGMENT: - IPin_NewSegment(pin->pin.pin.peer, event.u.segment.position, - event.u.segment.stop, event.u.segment.rate); break; case WG_PARSER_EVENT_NONE: @@ -972,6 +984,8 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) if (FAILED(hr = IMemAllocator_Commit(filter->sources[i]->pin.pAllocator))) ERR("Failed to commit allocator, hr %#lx.\n", hr); + filter->sources[i]->need_segment = true; + filter->sources[i]->thread = CreateThread(NULL, 0, stream_thread, filter->sources[i], 0, NULL); } @@ -1359,6 +1373,8 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { struct parser_source *flush_pin = filter->sources[i]; + flush_pin->need_segment = true; + if (flush_pin->pin.pin.peer) LeaveCriticalSection(&flush_pin->flushing_cs); }

1 0

Rémi Bernon : include: Use fully qualified names in windows.foundation.collections.idl.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 85ff05a5658f95f14e38741d12a25b123326e692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85ff05a5658f95f14e38741d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 21 19:38:57 2022 +0100 include: Use fully qualified names in windows.foundation.collections.idl. Although more verbose this makes things more consistent everywhere, when types from other namespaces are referenced. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index d69c27f6bbd..7576f331172 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -53,7 +53,8 @@ cpp_quote("#endif") contract(Windows.Foundation.FoundationContract, 1.0), uuid(fcdcf02c-e5d8-4478-915a-4d90b74b83a5) ] - delegate HRESULT AsyncOperationCompletedHandler<TResult>([in] IAsyncOperation<TResult> *info, [in] AsyncStatus status); + delegate HRESULT AsyncOperationCompletedHandler<TResult>([in] Windows.Foundation.IAsyncOperation<TResult> *info, + [in] AsyncStatus status); [ contract(Windows.Foundation.FoundationContract, 1.0), @@ -61,8 +62,8 @@ cpp_quote("#endif") ] interface IAsyncOperation<TResult> : IInspectable { - [propput] HRESULT Completed([in] AsyncOperationCompletedHandler<TResult> *handler); - [propget] HRESULT Completed([out, retval] AsyncOperationCompletedHandler<TResult> **handler); + [propput] HRESULT Completed([in] Windows.Foundation.AsyncOperationCompletedHandler<TResult> *handler); + [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncOperationCompletedHandler<TResult> **handler); HRESULT GetResults([out, retval] TResult **results); } @@ -110,12 +111,13 @@ cpp_quote("#endif") uuid(e480ce40-a338-4ada-adcf-272272e48cb9) ] interface IMapView<K, V> : IInspectable - requires IIterable<IKeyValuePair<K, V> *> + requires Windows.Foundation.Collections.IIterable<Windows.Foundation.Collections.IKeyValuePair<K, V> *> { HRESULT Lookup([in] K key, [out, retval] V *value); [propget] HRESULT Size([out, retval] unsigned int *size); HRESULT HasKey([in] K key, [out, retval] boolean *found); - HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second); + HRESULT Split([out] Windows.Foundation.Collections.IMapView<K, V> **first, + [out] Windows.Foundation.Collections.IMapView<K, V> **second); } [ @@ -138,7 +140,7 @@ cpp_quote("#endif") { HRESULT GetAt([in, optional] UINT32 index, [out, retval] T *value); [propget] HRESULT Size([out, retval] UINT32 *value); - HRESULT GetView([out, retval] IVectorView<T> **value); + HRESULT GetView([out, retval] Windows.Foundation.Collections.IVectorView<T> **value); HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); HRESULT SetAt([in] UINT32 index, [in, optional] T value); HRESULT InsertAt([in] UINT32 index, [in, optional] T value);

1 0

Michael Stefaniuc : dmusic: Forward GetFormat() to the corresponding synth & sink methods.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 5815ba45481f8ec5f7b45652d22a131f8ae8ea21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5815ba45481f8ec5f7b45652… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 22 00:49:59 2022 +0100 dmusic: Forward GetFormat() to the corresponding synth & sink methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 59 ++++++++++++---------------------------------- dlls/dmusic/tests/dmusic.c | 21 +++++++++++++++++ 2 files changed, 36 insertions(+), 44 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index d593d739a9e..8549c62c4b1 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -510,50 +510,21 @@ static HRESULT WINAPI synth_port_SetDirectSound(IDirectMusicPort *iface, IDirect return S_OK; } -static HRESULT WINAPI synth_port_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *pWaveFormatEx, - DWORD *pdwWaveFormatExSize, DWORD *pdwBufferSize) -{ - struct synth_port *This = synth_from_IDirectMusicPort(iface); - WAVEFORMATEX format; - FIXME("(%p, %p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSize, pdwBufferSize); - - if (pWaveFormatEx == NULL) - { - if (pdwWaveFormatExSize) - *pdwWaveFormatExSize = sizeof(format); - else - return E_POINTER; - } - else - { - if (pdwWaveFormatExSize == NULL) - return E_POINTER; - - /* Just fill this in with something that will not crash Direct Sound for now. */ - /* It won't be used anyway until Performances are completed */ - format.wFormatTag = WAVE_FORMAT_PCM; - format.nChannels = 2; /* This->params.dwAudioChannels; */ - format.nSamplesPerSec = 44100; /* This->params.dwSampleRate; */ - format.wBitsPerSample = 16; /* FIXME: check this */ - format.nBlockAlign = (format.wBitsPerSample * format.nChannels) / 8; - format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; - format.cbSize = 0; - - if (*pdwWaveFormatExSize >= sizeof(format)) - { - CopyMemory(pWaveFormatEx, &format, min(sizeof(format), *pdwWaveFormatExSize)); - *pdwWaveFormatExSize = sizeof(format); /* FIXME check if this is set */ - } - else - return E_POINTER; /* FIXME find right error */ - } - - if (pdwBufferSize) - *pdwBufferSize = 44100 * 2 * 2; - else - return E_POINTER; - - return S_OK; +static HRESULT WINAPI synth_port_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *format, + DWORD *fmtsize, DWORD *bufsize) +{ + struct synth_port *This = synth_from_IDirectMusicPort(iface); + HRESULT hr; + + TRACE("(%p, %p, %p, %p)\n", This, format, fmtsize, bufsize); + + if (FAILED(hr = IDirectMusicSynth_GetFormat(This->synth, format, fmtsize))) + return hr; + + if (bufsize) + hr = IDirectMusicSynthSink_GetDesiredBufferSize(This->synth_sink, bufsize); + + return hr; } static const IDirectMusicPortVtbl synth_port_vtbl = { diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index d8fc6affd9b..37b517fe0ca 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -877,6 +877,9 @@ static void test_synthport(void) IDirectMusicPort *port; DMUS_BUFFERDESC desc; DMUS_PORTCAPS caps; + WAVEFORMATEX fmt; + DWORD fmtsize, bufsize; + HRESULT hr; port = create_synth_port(&dmusic); @@ -922,6 +925,24 @@ static void test_synthport(void) ok(caps.dwEffectFlags == DMUS_EFFECT_REVERB, "Unexpected dwEffectFlags returned: %#lx\n", caps.dwEffectFlags); trace("Port wszDescription: %s\n", wine_dbgstr_w(caps.wszDescription)); + /* GetFormat */ + hr = IDirectMusicPort_GetFormat(port, NULL, NULL, NULL); + ok(hr == E_POINTER, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicPort_GetFormat(port, NULL, &fmtsize, NULL); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(fmtsize == sizeof(fmt), "format size; %ld\n", fmtsize); + fmtsize = 0; + hr = IDirectMusicPort_GetFormat(port, &fmt, &fmtsize, NULL); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(fmtsize == sizeof(fmt), "format size; %ld\n", fmtsize); + hr = IDirectMusicPort_GetFormat(port, NULL, NULL, &bufsize); + ok(hr == E_POINTER, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicPort_GetFormat(port, NULL, &fmtsize, &bufsize); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicPort_GetFormat(port, &fmt, &fmtsize, &bufsize); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(bufsize == fmt.nSamplesPerSec * fmt.nChannels * 4, "buffer size: %ld\n", bufsize); + IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic); }

1 0

Rémi Bernon : include: Remove nested namespaces in windows.gaming.input.idl.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 916d20cb97ca2a454e7326d7e067bb684b1fda82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=916d20cb97ca2a454e7326d7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 21 19:52:46 2022 +0100 include: Remove nested namespaces in windows.gaming.input.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.idl | 602 +++++++++++++++++++-------------------- 1 file changed, 293 insertions(+), 309 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=916d20cb97ca2a454e73…

1 0

Eric Pouech : msxml3/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: bee722a77b5fe4c967e150dbd0d18d4b798664f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bee722a77b5fe4c967e150db… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:07:27 2022 +0100 msxml3/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 28 ++++++++++++++-------------- dlls/msxml3/tests/httpreq.c | 4 ++-- dlls/msxml3/tests/saxreader.c | 14 +++++++------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f7929cd3a23..ac68071ed04 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7532,7 +7532,7 @@ static void test_XSLPattern(void) if (len) { if (ptr->todo) { char *str = list_to_string(list); - todo_wine + todo_wine ok(!strcmp(str, ptr->list), "Invalid node list: %s, expected %s\n", str, ptr->list); IXMLDOMNodeList_Release(list); } @@ -8730,7 +8730,7 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_get_xml(doc, &xml); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(!wcscmp(xml, xml1), "got %s\n", wine_dbgstr_w(xml)); SysFreeString(xml); @@ -10942,7 +10942,7 @@ static void test_mxnamespacemanager(void) EXPECT_REF(mgr2, 2); prefixes = NULL; hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { @@ -11513,7 +11513,7 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; @@ -11528,7 +11528,7 @@ todo_wine hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; @@ -11581,7 +11581,7 @@ todo_wine hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); IXMLDOMNodeList_Release(node_list); @@ -11607,7 +11607,7 @@ todo_wine hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); IDispatchEx_Release(dispex); @@ -11712,7 +11712,7 @@ todo_wine { V_VT(&ret) = VT_EMPTY; V_DISPATCH(&ret) = (void*)0x1; hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); @@ -11752,7 +11752,7 @@ todo_wine V_I4(&ret) = 1; hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); @@ -12791,7 +12791,7 @@ static void test_newline_normalization(void) if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) { /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ -todo_wine + todo_wine ok(!lstrcmpW(s, L"<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>"), "got %s\n", wine_dbgstr_w(s)); } @@ -13303,7 +13303,7 @@ static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, IsEqualIID(riid, &IID_ISequentialStream) || IsEqualIID(riid, &IID_IResponse); -todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) + todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) ok(known_iid, "Unexpected riid %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; @@ -13733,15 +13733,15 @@ static void test_load_with_site(void) hr = IObjectWithSite_SetSite(site, (IUnknown *)&sp); ok(hr == S_OK, "got %#x\n", hr); ok(qi_count != 0, "got %d QI calls\n", qi_count); -todo_wine + todo_wine ok(qi_list_contains(&IID_IXMLDOMDocument), "QI(IID_IXMLDOMDocument) was not called\n"); ok(qi_list_contains(&IID_IHTMLDocument2), "QI(IID_IHTMLDocument2) was not called\n"); ok(qi_list_contains(&IID_IServiceProvider), "QI(IID_IServiceProvider) was not called\n"); -todo_wine + todo_wine ok(qi_list_contains(&IID_IOleClientSite), "QI(IID_IOleClientSite) was not called\n"); ok(qi_list_contains_service(&SID_SContainerDispatch, &IID_IHTMLDocument2), "QI(SID_SContainerDispatch, IID_IHTMLDocument2) was not called\n"); -todo_wine + todo_wine ok(qi_list_contains_service(&SID_SInternetHostSecurityManager, &IID_IXMLDOMDocument), "QI(SID_SInternetHostSecurityManager, IID_IXMLDOMDocument) was not called\n"); diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 2491e499638..9368ab3c93c 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1401,11 +1401,11 @@ static void set_xhr_site(IXMLHttpRequest *xhr) EXPECT_HR(hr, S_OK); CHECK_CALLED(site_qi_IServiceProvider); -todo_wine + todo_wine CHECK_CALLED(sp_queryservice_SID_SBindHost); CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); -todo_wine + todo_wine CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); /* this one isn't very reliable CHECK_CALLED(sp_queryservice_SID_secmgr_secmgr); */ diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 20c5e07443b..ef3818f6f2c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4504,7 +4504,7 @@ static void test_mxwriter_domdoc(void) V_DISPATCH(&dest) = (IDispatch *)domdoc; hr = IMXWriter_put_output(writer, dest); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); if (FAILED(hr)) { @@ -4530,11 +4530,11 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXMLDOMDocument_get_documentElement(domdoc, &root); -todo_wine + todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); /* startElement allows document root node to be accessed. */ @@ -4547,7 +4547,7 @@ todo_wine hr = IXMLDOMElement_get_nodeName(root, &str); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(!lstrcmpW(L"BankAccount", str), "Unexpected name %s.\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -4560,11 +4560,11 @@ todo_wine hr = IXMLDOMNodeList_get_length(node_list, &list_length); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(list_length == 1, "list length %i, expected 1\n", list_length); hr = IXMLDOMNodeList_get_item(node_list, 0, &node); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXMLDOMNode_get_nodeName(node, &str); @@ -4618,7 +4618,7 @@ todo_wine { ok(2 == list_length, "list length %i, expected 2\n", list_length); } hr = IXMLDOMNodeList_get_item(node_list, 1, &node); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXMLDOMNode_get_nodeName(node, &str);

1 0

Dmitry Timoshkov : comctl32/listview: Fix changed notification mask for inserted items.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: f1a3586f10135ce58e3343df8800b533698fe65b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1a3586f10135ce58e3343df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 22 11:06:28 2022 +0300 comctl32/listview: Fix changed notification mask for inserted items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d8abd8236eb..2cb96367551 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4258,7 +4258,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; } - nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; + nmlv.uChanged = isNew ? LVIF_STATE : (uChanged ? uChanged : lpLVItem->mask); nmlv.lParam = item.lParam; /* Send change notification if the item is not being inserted, or inserted (selected|focused), diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 92e11685331..3810cd8f4bc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6023,7 +6023,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, FALSE); } else { @@ -6100,7 +6100,7 @@ static void test_insertitem(void) item.lParam = 0xdeadbeef; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 3, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", FALSE); /* insert item 4 */ item.mask = LVIF_PARAM;

1 0