February 2024 - Wine-Commits

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

Feb. 28, 2024

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

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

Feb. 28, 2024

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 Feb. 28, 2024

Feb. 28, 2024

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

Yuxuan Shui : dmime: Better MIDI parsing interface.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

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

Alexandre Julliard : ntdll: Move RtlHashUnicodeString constants to a public header.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 9478e1f74c343ca3fa237d2bdb11ab969d9ca03e URL: https://gitlab.winehq.org/wine/wine/-/commit/9478e1f74c343ca3fa237d2bdb11ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 14:22:04 2024 +0100 ntdll: Move RtlHashUnicodeString constants to a public header. --- dlls/ntdll/ntdll_misc.h | 6 ------ dlls/ntdll/tests/rtlstr.c | 3 --- include/winternl.h | 5 +++++ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 9ac3d5a9c86..50a3dde574c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -122,12 +122,6 @@ static inline TEB64 *NtCurrentTeb64(void) { return NULL; } static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiBatchCount; } #endif -#define HASH_STRING_ALGORITHM_DEFAULT 0 -#define HASH_STRING_ALGORITHM_X65599 1 -#define HASH_STRING_ALGORITHM_INVALID 0xffffffff - -NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); - /* convert from straight ASCII to Unicode without depending on the current codepage */ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) { diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 53ac223980e..3d2d4e4ac5e 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -30,9 +30,6 @@ #include "winnls.h" #include "guiddef.h" -#define HASH_STRING_ALGORITHM_X65599 1 -#define HASH_STRING_ALGORITHM_INVALID 0xffffffff - /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); diff --git a/include/winternl.h b/include/winternl.h index 04778c5cd59..cccbc149480 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4331,6 +4331,11 @@ typedef struct _API_SET_VALUE_ENTRY ULONG ValueLength; } API_SET_VALUE_ENTRY; + +#define HASH_STRING_ALGORITHM_DEFAULT 0 +#define HASH_STRING_ALGORITHM_X65599 1 +#define HASH_STRING_ALGORITHM_INVALID 0xffffffff + /*********************************************************************** * Function declarations */

1 0

Alexandre Julliard : ntdll: Use the exported structures for dll redirection data.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 6a153ac33e25d7cbd5633aa4b9ab95eddf94eeab URL: https://gitlab.winehq.org/wine/wine/-/commit/6a153ac33e25d7cbd5633aa4b9ab95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 14:19:35 2024 +0100 ntdll: Use the exported structures for dll redirection data. --- dlls/ntdll/actctx.c | 51 ++++++++++++++++++++++++++----------------------- dlls/ntdll/loader.c | 20 ++++++++++--------- dlls/ntdll/ntdll_misc.h | 15 --------------- include/winnt.h | 20 +++++++++++++++++++ 4 files changed, 58 insertions(+), 48 deletions(-)

1 0

Alexandros Frantzis : winex11.drv: Remove unused refresh_drawables field.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

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

Alexandre Julliard : winedump: Print the correct register names for exception info on ARM64.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: ebaa47dcee08cb58d407a8dd15323258e8e5aa79 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebaa47dcee08cb58d407a8dd153232… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 19:03:14 2024 +0100 winedump: Print the correct register names for exception info on ARM64. --- tools/winedump/pe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1104072a2c2..d4bf46c5307 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1424,15 +1424,15 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) } else if (ptr[i] < 0x40) /* save_r19r20_x */ { - printf( "stp r19,r20,[sp,-#%#x]!\n", 8 * (val & 0x1f) ); + printf( "stp x19,x20,[sp,-#%#x]!\n", 8 * (val & 0x1f) ); } else if (ptr[i] < 0x80) /* save_fplr */ { - printf( "stp r29,lr,[sp,#%#x]\n", 8 * (val & 0x3f) ); + printf( "stp x29,lr,[sp,#%#x]\n", 8 * (val & 0x3f) ); } else if (ptr[i] < 0xc0) /* save_fplr_x */ { - printf( "stp r29,lr,[sp,-#%#x]!\n", 8 * (val & 0x3f) + 8 ); + printf( "stp x29,lr,[sp,-#%#x]!\n", 8 * (val & 0x3f) + 8 ); } else if (ptr[i] < 0xc8) /* alloc_m */ { @@ -1441,27 +1441,27 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) else if (ptr[i] < 0xcc) /* save_regp */ { int reg = 19 + ((val >> 6) & 0xf); - printf( "stp r%u,r%u,[sp,#%#x]\n", reg, reg + 1, 8 * (val & 0x3f) ); + printf( "stp x%u,x%u,[sp,#%#x]\n", reg, reg + 1, 8 * (val & 0x3f) ); } else if (ptr[i] < 0xd0) /* save_regp_x */ { int reg = 19 + ((val >> 6) & 0xf); - printf( "stp r%u,r%u,[sp,-#%#x]!\n", reg, reg + 1, 8 * (val & 0x3f) + 8 ); + printf( "stp x%u,x%u,[sp,-#%#x]!\n", reg, reg + 1, 8 * (val & 0x3f) + 8 ); } else if (ptr[i] < 0xd4) /* save_reg */ { int reg = 19 + ((val >> 6) & 0xf); - printf( "str r%u,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); + printf( "str x%u,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); } else if (ptr[i] < 0xd6) /* save_reg_x */ { int reg = 19 + ((val >> 5) & 0xf); - printf( "str r%u,[sp,-#%#x]!\n", reg, 8 * (val & 0x1f) + 8 ); + printf( "str x%u,[sp,-#%#x]!\n", reg, 8 * (val & 0x1f) + 8 ); } else if (ptr[i] < 0xd8) /* save_lrpair */ { int reg = 19 + 2 * ((val >> 6) & 0x7); - printf( "stp r%u,lr,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); + printf( "stp x%u,lr,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); } else if (ptr[i] < 0xda) /* save_fregp */ {

1 0

Alexandre Julliard : ntdll: Remove no longer needed definitions from the private header.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 3de0f99d4eec174a66faf454f55577636b46a523 URL: https://gitlab.winehq.org/wine/wine/-/commit/3de0f99d4eec174a66faf454f55577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 14:25:24 2024 +0100 ntdll: Remove no longer needed definitions from the private header. --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8f7097a2460..ef3fafd994c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -138,7 +138,7 @@ typedef struct _wine_modref static UINT tls_module_count; /* number of modules with TLS directory */ static IMAGE_TLS_DIRECTORY *tls_dirs; /* array of TLS directories */ -LIST_ENTRY tls_links = { &tls_links, &tls_links }; +static LIST_ENTRY tls_links = { &tls_links, &tls_links }; static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 50a3dde574c..24c583dd159 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -30,13 +30,6 @@ #include "unixlib.h" #include "wine/asm.h" -#define DECLARE_CRITICAL_SECTION(cs) \ - static RTL_CRITICAL_SECTION cs; \ - static RTL_CRITICAL_SECTION_DEBUG cs##_debug = \ - { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ - 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ - static RTL_CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; - #define MAX_NT_PATH_LENGTH 277 #define NTDLL_TLS_ERRNO 16 /* TLS slot for _errno() */ @@ -79,7 +72,7 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } extern void WINAPI LdrInitializeThunk(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR); -extern NTSTATUS WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*); +extern void WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*); extern void WINAPI KiUserApcDispatcher(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC); extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG); extern void WINAPI KiUserCallbackDispatcherReturn(void); @@ -99,7 +92,6 @@ extern void init_user_process_params(void); extern void get_resource_lcids( LANGID *user, LANGID *user_neutral, LANGID *system ); /* module handling */ -extern LIST_ENTRY tls_links; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ); extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, @@ -113,9 +105,6 @@ extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void * extern struct _KUSER_SHARED_DATA *user_shared_data; -extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, va_list args ); -extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, va_list args ); - #ifdef _WIN64 static inline TEB64 *NtCurrentTeb64(void) { return NULL; } #else

1 0

Rémi Bernon : winevulkan: Remove unnecessary WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT quirk.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 72c228a3ab6913930d19b926a971cb93345113be URL: https://gitlab.winehq.org/wine/wine/-/commit/72c228a3ab6913930d19b926a971cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 10:23:11 2024 +0100 winevulkan: Remove unnecessary WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT quirk. --- dlls/winevulkan/vulkan.c | 4 +--- dlls/winevulkan/vulkan_loader.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index de7f7282c4e..01d2a0c20a0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -893,8 +893,6 @@ VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } - object->quirks |= WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT; - client_instance->base.unix_handle = (uintptr_t)object; *instance = client_instance; TRACE("Created instance %p, host_instance %p.\n", object, object->host_instance); @@ -1866,7 +1864,7 @@ static void adjust_surface_capabilities(struct wine_instance *instance, struct w * https://vulkan.gpuinfo.org/displayreport.php?id=9122#surface * https://vulkan.gpuinfo.org/displayreport.php?id=9121#surface */ - if ((instance->quirks & WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT) && !capabilities->maxImageCount) + if (!capabilities->maxImageCount) capabilities->maxImageCount = max(capabilities->minImageCount, 16); /* Update the image extents to match what the Win32 WSI would provide. */ diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 6f62201f503..710c07772fc 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -39,7 +39,6 @@ #define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE #define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 -#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 /* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. * This structure MUST be the first element of a dispatchable object as the ICD

1 0