February 2024 - Wine-commits

Alexandros Frantzis : winex11.drv: Remove unused refresh_drawables field.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 8e0a00db04e2f860197da14ebcf01853a58b6638 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e0a00db04e2f860197da14ebcf018… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Feb 28 09:23:40 2024 +0200 winex11.drv: Remove unused refresh_drawables field. The field is set but no longer read from. --- dlls/winex11.drv/opengl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d70f1928655..afedfb38af3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -205,7 +205,6 @@ struct wgl_context GLXContext ctx; struct gl_drawable *drawables[2]; struct gl_drawable *new_drawables[2]; - BOOL refresh_drawables; struct list entry; }; @@ -1870,7 +1869,6 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) ctx->has_been_current = TRUE; ctx->hdc = hdc; set_context_drawables( ctx, gl, gl ); - ctx->refresh_drawables = FALSE; pthread_mutex_unlock( &context_mutex ); goto done; } @@ -1915,7 +1913,6 @@ static BOOL X11DRV_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct ctx->has_been_current = TRUE; ctx->hdc = draw_hdc; set_context_drawables( ctx, draw_gl, read_gl ); - ctx->refresh_drawables = FALSE; NtCurrentTeb()->glContext = ctx; pthread_mutex_unlock( &context_mutex ); goto done;

1 0

Yuxuan Shui : dmband: Move band.c to dmusic.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 09c6f48b1295b900df5a7d104996e0e69b7f23b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/09c6f48b1295b900df5a7d104996e0… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Jan 31 15:48:30 2024 +0000 dmband: Move band.c to dmusic. --- dlls/dmband/bandtrack.c | 1 + dlls/dmband/dmband_main.c | 1 + dlls/dmband/dmband_private.h | 10 ---------- dlls/dmusic/Makefile.in | 1 + dlls/{dmband => dmusic}/band.c | 3 +-- dlls/dmusic/dmusic_band.h | 25 +++++++++++++++++++++++++ 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index b410cf81d3a..45346ad1f7a 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -17,6 +17,7 @@ */ #include "dmband_private.h" +#include "dmusic_band.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmband); diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index 55f979e3fbc..43790fbff61 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -20,6 +20,7 @@ #include "initguid.h" #include "dmband_private.h" #include "rpcproxy.h" +#include "dmusic_band.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmband); diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 48c5ec02aeb..3b2617322fe 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -20,21 +20,16 @@ #ifndef __WINE_DMBAND_PRIVATE_H #define __WINE_DMBAND_PRIVATE_H -#include <stdio.h> #include <stdarg.h> -#include <string.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winnt.h" -#include "wingdi.h" -#include "winuser.h" #include "wine/debug.h" #include "wine/list.h" -#include "winreg.h" #include "objbase.h" #include "dmusici.h" @@ -44,11 +39,6 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT create_dmband(REFIID riid, void **ret_iface); extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface); -extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection); -extern HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance, - IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id); - #endif /* __WINE_DMBAND_PRIVATE_H */ diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index 8e1c07e90a7..446eca15543 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -2,6 +2,7 @@ MODULE = dmusic.dll IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm SOURCES = \ + band.c \ buffer.c \ clock.c \ collection.c \ diff --git a/dlls/dmband/band.c b/dlls/dmusic/band.c similarity index 99% rename from dlls/dmband/band.c rename to dlls/dmusic/band.c index 78ec68ae035..370b85c2941 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmusic/band.c @@ -17,8 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmband_private.h" -#include "dmobject.h" +#include "dmusic_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmband); diff --git a/dlls/dmusic/dmusic_band.h b/dlls/dmusic/dmusic_band.h new file mode 100644 index 00000000000..e189acb7230 --- /dev/null +++ b/dlls/dmusic/dmusic_band.h @@ -0,0 +1,25 @@ +/* DirectMusicBand Private Include + * + * Copyright (C) 2024 Yuxuan Shui for CodeWeavers + * + * This program 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 program 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 program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dmusici.h" + +extern HRESULT create_dmband(REFIID riid, void **ret_iface); +extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection); +extern HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance, + IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id);

1 0

Yuxuan Shui : dmime: Better MIDI parsing interface.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: aebcb1a996724aadc2fc02f913c10bdc1e711faf URL: https://gitlab.winehq.org/wine/wine/-/commit/aebcb1a996724aadc2fc02f913c10b… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Feb 27 15:42:52 2024 +0000 dmime: Better MIDI parsing interface. MIDI tracks don't map one-to-one to segment tracks, so it doesn't make sense to use a "get_next_track()" interface. --- dlls/dmime/dmime_private.h | 7 ++----- dlls/dmime/midi.c | 23 +++++++++++++++++------ dlls/dmime/segment.c | 16 +--------------- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index cdf0810381d..1c030dc314d 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -70,11 +70,8 @@ extern HRESULT create_dmtempotrack(REFIID riid, void **ret_iface); extern HRESULT create_dmtimesigtrack(REFIID riid, void **ret_iface); extern HRESULT create_dmwavetrack(REFIID riid, void **ret_iface); -/* Create a new MIDI file parser. Note the stream might still be modified even - * when this function fails. */ -extern HRESULT midi_parser_new(IStream *stream, struct midi_parser **out_parser); -extern HRESULT midi_parser_next_track(struct midi_parser *parser, IDirectMusicTrack **out_track, MUSIC_TIME *out_length); -extern void midi_parser_destroy(struct midi_parser *parser); +/* Parse a MIDI file. Note the stream might still be modified even when this function fails. */ +extern HRESULT parse_midi(IStream *stream, IDirectMusicSegment8 *segment); extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerformance8*); extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*); diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c index a31146e636f..40db1d2232c 100644 --- a/dlls/dmime/midi.c +++ b/dlls/dmime/midi.c @@ -125,10 +125,10 @@ static HRESULT read_midi_event(IStream *stream, BYTE *last_status, ULONG *bytes_ return S_OK; } -HRESULT midi_parser_next_track(struct midi_parser *parser, IDirectMusicTrack **out_track, MUSIC_TIME *out_length) +static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment8 *segment) { WORD i = 0; - TRACE("(%p, %p): stub\n", parser, out_length); + TRACE("(%p, %p): stub\n", parser, segment); for (i = 0;; i++) { HRESULT hr; @@ -159,7 +159,13 @@ HRESULT midi_parser_next_track(struct midi_parser *parser, IDirectMusicTrack **o return S_FALSE; } -HRESULT midi_parser_new(IStream *stream, struct midi_parser **out_parser) +static void midi_parser_destroy(struct midi_parser *parser) +{ + IStream_Release(parser->stream); + free(parser); +} + +static HRESULT midi_parser_new(IStream *stream, struct midi_parser **out_parser) { LARGE_INTEGER offset; DWORD length; @@ -202,8 +208,13 @@ HRESULT midi_parser_new(IStream *stream, struct midi_parser **out_parser) return hr; } -void midi_parser_destroy(struct midi_parser *parser) +HRESULT parse_midi(IStream *stream, IDirectMusicSegment8 *segment) { - IStream_Release(parser->stream); - free(parser); + struct midi_parser *parser; + HRESULT hr; + + if (FAILED(hr = midi_parser_new(stream, &parser))) return hr; + hr = midi_parser_parse(parser, segment); + midi_parser_destroy(parser); + return hr; } diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index b0485aaedd9..b96f0e2e401 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -791,10 +791,7 @@ static inline struct segment *impl_from_IPersistStream(IPersistStream *iface) static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream *stream) { struct segment *This = impl_from_IPersistStream(iface); - IDirectMusicTrack *track; - MUSIC_TIME length; struct chunk_entry chunk = {0}; - struct midi_parser *midi_parser; HRESULT hr; TRACE("(%p, %p): Loading\n", This, stream); @@ -810,18 +807,7 @@ static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream break; case mmioFOURCC('M','T','h','d'): - hr = midi_parser_new(stream, &midi_parser); - if (FAILED(hr)) break; - This->header.mtLength = 0; - while ((hr = midi_parser_next_track(midi_parser, &track, &length)) == S_OK) - { - hr = segment_append_track(This, track, 1, 0); - IDirectMusicTrack_Release(track); - if (FAILED(hr)) break; - if (length > This->header.mtLength) - This->header.mtLength = length; - } - midi_parser_destroy(midi_parser); + hr = parse_midi(stream, &This->IDirectMusicSegment8_iface); break; case MAKE_IDTYPE(FOURCC_RIFF, mmioFOURCC('W','A','V','E')):

1 0

Yuxuan Shui : dmime: Parse MIDI program change events and generate a bandtrack.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 05347b9703f12876efe53843f8a1d8360bdcfbb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/05347b9703f12876efe53843f8a1d8… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Feb 27 15:43:52 2024 +0000 dmime: Parse MIDI program change events and generate a bandtrack. --- dlls/dmime/Makefile.in | 1 + dlls/dmime/midi.c | 112 ++++++++++++++++++++++++++++++++------- dlls/dmime/tests/dmime.c | 130 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/dmusic/band.c | 14 +++++ dlls/dmusic/dmusic_band.h | 2 + 5 files changed, 236 insertions(+), 23 deletions(-)

1 0

Yuxuan Shui : dmime: Add a stub chordtrack for MIDI segments.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 29f73d6669c8538a9043afbc5a952b220af11203 URL: https://gitlab.winehq.org/wine/wine/-/commit/29f73d6669c8538a9043afbc5a952b… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Thu Feb 15 16:54:54 2024 +0000 dmime: Add a stub chordtrack for MIDI segments. --- dlls/dmime/midi.c | 20 +++++++++++--------- dlls/dmime/tests/dmime.c | 10 +++++----- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c index 439511d15cc..647ef1d123c 100644 --- a/dlls/dmime/midi.c +++ b/dlls/dmime/midi.c @@ -40,6 +40,7 @@ struct midi_event struct midi_parser { + IDirectMusicTrack *chordtrack; IDirectMusicTrack *bandtrack; MUSIC_TIME time; IStream *stream; @@ -221,13 +222,16 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment music_length = (ULONGLONG)music_length * DMUS_PPQ / parser->division + 1; if (SUCCEEDED(hr)) hr = IDirectMusicSegment8_SetLength(segment, music_length); if (SUCCEEDED(hr)) hr = IDirectMusicSegment8_InsertTrack(segment, parser->bandtrack, 0xffff); + if (SUCCEEDED(hr)) hr = IDirectMusicSegment8_InsertTrack(segment, parser->chordtrack, 0xffff); + return hr; } static void midi_parser_destroy(struct midi_parser *parser) { IStream_Release(parser->stream); - IDirectMusicTrack_Release(parser->bandtrack); + if (parser->bandtrack) IDirectMusicTrack_Release(parser->bandtrack); + if (parser->chordtrack) IDirectMusicTrack_Release(parser->chordtrack); free(parser); } @@ -267,18 +271,16 @@ static HRESULT midi_parser_new(IStream *stream, struct midi_parser **out_parser) parser = calloc(1, sizeof(struct midi_parser)); if (!parser) return E_OUTOFMEMORY; + IStream_AddRef(stream); parser->stream = stream; parser->division = division; hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void **)&parser->bandtrack); - if (FAILED(hr)) - { - free(parser); - return hr; - } - - *out_parser = parser; - IStream_AddRef(stream); + if (SUCCEEDED(hr)) + hr = CoCreateInstance(&CLSID_DirectMusicChordTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void **)&parser->chordtrack); + if (FAILED(hr)) midi_parser_destroy(parser); + else *out_parser = parser; return hr; } diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 41b34944f9d..97a6088936e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1681,7 +1681,7 @@ static void test_midi(void) ok(hr == S_OK, "got %#lx\n", hr); expect_track(segment, BandTrack, -1, 0); - todo_wine expect_track(segment, ChordTrack, -1, 1); + expect_track(segment, ChordTrack, -1, 1); todo_wine expect_track(segment, TempoTrack, -1, 2); todo_wine expect_track(segment, TimeSigTrack, -1, 3); todo_wine expect_track(segment, SeqTrack, -1, 4); @@ -1723,7 +1723,7 @@ static void test_midi(void) IStream_Release(stream); /* TempoTrack and TimeSigTrack seems to be optional. */ expect_track(segment, BandTrack, -1, 0); - todo_wine expect_track(segment, ChordTrack, -1, 1); + expect_track(segment, ChordTrack, -1, 1); todo_wine expect_track(segment, SeqTrack, -1, 2); IDirectMusicSegment_Release(segment); @@ -1759,7 +1759,7 @@ static void test_midi(void) IPersistStream_Release(persist); IStream_Release(stream); expect_track(segment, BandTrack, -1, 0); - todo_wine expect_track(segment, ChordTrack, -1, 1); + expect_track(segment, ChordTrack, -1, 1); todo_wine expect_track(segment, TempoTrack, -1, 2); todo_wine expect_track(segment, SeqTrack, -1, 3); IDirectMusicSegment_Release(segment); @@ -1795,7 +1795,7 @@ static void test_midi(void) IPersistStream_Release(persist); IStream_Release(stream); expect_track(segment, BandTrack, -1, 0); - todo_wine expect_track(segment, ChordTrack, -1, 1); + expect_track(segment, ChordTrack, -1, 1); /* there is no tempo track. */ todo_wine expect_track(segment, SeqTrack, -1, 2); IDirectMusicSegment_Release(segment); @@ -1832,7 +1832,7 @@ static void test_midi(void) IPersistStream_Release(persist); IStream_Release(stream); expect_track(segment, BandTrack, -1, 0); - todo_wine expect_track(segment, ChordTrack, -1, 1); + expect_track(segment, ChordTrack, -1, 1); todo_wine expect_track(segment, SeqTrack, -1, 2); hr = test_tool_create(message_types, ARRAY_SIZE(message_types), &tool);

1 0

Piotr Caban : wininet: Fix memory leak when loading proxy information.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: da84d77353dfcd32bb941ac1ec61f42fb798433d URL: https://gitlab.winehq.org/wine/wine/-/commit/da84d77353dfcd32bb941ac1ec61f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 27 14:15:17 2024 +0100 wininet: Fix memory leak when loading proxy information. --- dlls/wininet/internet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5ee1242da1b..fe016e29cd5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -710,6 +710,7 @@ static LONG load_connection_settings( HKEY key, const WCHAR *connection, proxyin res = connection_settings_read( settings, &pos, size, &lpwpi->proxyBypass ); if (!res) res = connection_settings_read( settings, &pos, size, &lpwpi->autoconf_url ); + free( settings ); if (res) { FreeProxyInfo( lpwpi );

1 0

Aida Jonikienė : qwave: Add QOSCloseHandle() stub.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: d6f13d8e0c464db1db7d82462198cbedb58703ff URL: https://gitlab.winehq.org/wine/wine/-/commit/d6f13d8e0c464db1db7d82462198cb… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Thu Feb 22 21:05:48 2024 +0200 qwave: Add QOSCloseHandle() stub. Discord calls this function when hanging up a call. --- dlls/qwave/main.c | 6 ++++++ dlls/qwave/qwave.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index a8755d993d1..e29b19b116b 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -43,3 +43,9 @@ BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +BOOL WINAPI QOSCloseHandle(HANDLE handle) +{ + FIXME("%p stub!\n", handle); + return FALSE; +} diff --git a/dlls/qwave/qwave.spec b/dlls/qwave/qwave.spec index 83dfc6787cc..ff2994d11fb 100644 --- a/dlls/qwave/qwave.spec +++ b/dlls/qwave/qwave.spec @@ -2,7 +2,7 @@ @ stub QDLHStartDiagnosingPath @ stdcall QOSAddSocketToFlow(ptr long ptr long long ptr) @ stub QOSCancel -@ stub QOSCloseHandle +@ stdcall QOSCloseHandle(ptr) @ stdcall QOSCreateHandle(ptr ptr) @ stub QOSEnumerateFlows @ stub QOSNotifyFlow

1 0

Aida Jonikienė : qwave: Add tests for QOSCloseHandle().
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 61983465aafaacea3fd7bbb48531ccdc44975fc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/61983465aafaacea3fd7bbb48531cc… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Thu Feb 22 21:07:14 2024 +0200 qwave: Add tests for QOSCloseHandle(). --- dlls/qwave/tests/qos.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/qwave/tests/qos.c b/dlls/qwave/tests/qos.c index 7e8fddf64c4..efbc82e693d 100644 --- a/dlls/qwave/tests/qos.c +++ b/dlls/qwave/tests/qos.c @@ -64,7 +64,35 @@ static void test_QOSCreateHandle(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } +static void test_QOSCloseHandle(void) +{ + QOS_VERSION ver; + HANDLE h; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = QOSCloseHandle(NULL); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); + + ver.MajorVersion = 1; + ver.MinorVersion = 0; + ret = QOSCreateHandle(&ver, &h); + todo_wine ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + SetLastError(0xdeadbeef); + ret = QOSCloseHandle(h); + todo_wine ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = QOSCloseHandle((HANDLE)0xdeadbeef); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); +} + START_TEST(qos) { test_QOSCreateHandle(); + test_QOSCloseHandle(); }

1 0

Paul Gofman : kernelbase: Use KEY_WOW64_64KEY flag when 64 bit registry access is assumed.
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: 6cbe072c3799b27addb67014245ea7c59b1023dd URL: https://gitlab.winehq.org/wine/wine/-/commit/6cbe072c3799b27addb67014245ea7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 27 21:27:44 2024 -0600 kernelbase: Use KEY_WOW64_64KEY flag when 64 bit registry access is assumed. --- dlls/advapi32/tests/registry.c | 22 ++++++++++++++++++++++ dlls/kernelbase/registry.c | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index cff09e1a5c5..d66b10e8952 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2778,6 +2778,28 @@ static void test_redirection(void) RegCloseKey( root32 ); RegCloseKey( root64 ); + err = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\WOW6432Node\\test1\\test2", 0, NULL, 0, + KEY_WRITE | KEY_WOW64_32KEY, NULL, &key, NULL ); + ok(!err, "got %#lx.\n", err); + RegCloseKey(key); + + err = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\test1\\test2", 0, NULL, 0, KEY_WRITE | KEY_WOW64_32KEY, + NULL, &key, NULL ); + ok(!err, "got %#lx.\n", err); + RegCloseKey(key); + + err = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\test1\\test2", 0, KEY_WRITE | KEY_WOW64_32KEY, &key ); + ok(!err, "got %#lx.\n", err); + RegCloseKey(key); + + if (pRegDeleteTreeA) + { + err = pRegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\WOW6432Node\\test1"); + ok(!err, "got %#lx.\n", err); + err = pRegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\test1"); + ok(err == ERROR_FILE_NOT_FOUND, "got %#lx.\n", err); + } + /* Software\Classes is shared/reflected so behavior is different */ err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Classes\\Wine", diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index a767d993254..dcdb1cf84eb 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -165,7 +165,7 @@ static HANDLE open_wow6432node( HANDLE key ) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return key; + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED | KEY_WOW64_64KEY, &attr, 0 )) return key; return ret; } @@ -211,7 +211,7 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING *name, DWORD o static NTSTATUS open_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWORD options, ACCESS_MASK access ) { BOOL is_wow64_key = (is_win64 && (access & KEY_WOW64_32KEY)) || (is_wow64 && !(access & KEY_WOW64_64KEY)); - ACCESS_MASK access_64 = access & ~KEY_WOW64_32KEY; + ACCESS_MASK access_64 = (access & ~KEY_WOW64_32KEY) | KEY_WOW64_64KEY; DWORD i = 0, len = name->Length / sizeof(WCHAR); WCHAR *buffer = name->Buffer; UNICODE_STRING str;

1 0

Zhiyi Zhang : Revert "winex11.drv: Handle X error from vkGetRandROutputDisplayEXT()."
by Alexandre Julliard 28 Feb '24

28 Feb '24

Module: wine Branch: master Commit: d287548c77350b81faa946b0977dffcbfcce9b83 URL: https://gitlab.winehq.org/wine/wine/-/commit/d287548c77350b81faa946b0977dff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 28 10:22:23 2024 +0800 Revert "winex11.drv: Handle X error from vkGetRandROutputDisplayEXT()." This reverts commit 6f9d20806e821ab07c8adf81ae6630fae94b00ef. 6f9d208 was committed to work around a Nvidia driver bug that can cause vkGetRandROutputDisplayEXT() to generate an X exception and crash applications. The bug is later fixed in Nvidia driver 450.56.11 and newer. Thus 6f9d208 is no longer necessary on the newer Nvidia drivers. Then after 18ae96e, another bug in the Nvidia driver can cause vkGetRandROutputDisplayEXT() to hang forever when XLockDisplay() is called before vkGetRandROutputDisplayEXT() and this bug is still not fixed and affects multiple applications. Reverting 6f9d208 allows us to work around the vkGetRandROutputDisplayEXT() hang bug because then it no longer calls XLockDisplay() before vkGetRandROutputDisplayEXT(). Nvidia driver 455 was released on September 9th 2020 so hopefully the fix is already widespread. We could theoretically still keep 6f9d208 on older Nvidia drivers by doing version checks. But it's more straightforward to remove the workaround since it's not a bug of Wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53428 --- dlls/winex11.drv/xrandr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5c0269f3550..d77eb1a0163 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -707,11 +707,9 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) { - X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); - XSync( gdi_display, FALSE ); - if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) );

1 0