November 2023 - Wine-commits

Brendan Shanks : ntdll: Don't use sysconf(_SC_PHYS_PAGES) on macOS.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: c6b2bccfe7b9687ffb9bab165e6edefb3e51243e URL: https://gitlab.winehq.org/wine/wine/-/commit/c6b2bccfe7b9687ffb9bab165e6ede… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 13 16:17:56 2023 -0800 ntdll: Don't use sysconf(_SC_PHYS_PAGES) on macOS. --- dlls/ntdll/unix/virtual.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 464f343a575..75e6319c007 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3329,6 +3329,15 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; info->MmHighestPhysicalPage = max(1, total / page_size); } +#elif defined(__APPLE__) + /* sysconf(_SC_PHYS_PAGES) is buggy on macOS: in a 32-bit process, it + * returns an error on Macs with >4GB of RAM. + */ + INT64 memsize; + size_t len = sizeof(memsize); + + if (!sysctlbyname( "hw.memsize", &memsize, &len, NULL, 0 )) + info->MmHighestPhysicalPage = max(1, memsize / page_size); #elif defined(_SC_PHYS_PAGES) LONG64 phys_pages = sysconf( _SC_PHYS_PAGES );

1 0

Michael Stefaniuc : dmime: Remove redundant NULL check before free().
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: c3ef2e6efb2ebdd69e021b8518469a775c78c904 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3ef2e6efb2ebdd69e021b8518469a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 8 19:27:56 2023 +0100 dmime: Remove redundant NULL check before free(). --- dlls/dmime/segment.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 126bc44335d..e806a845d37 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -112,10 +112,7 @@ static ULONG WINAPI segment_Release(IDirectMusicSegment8 *iface) list_remove(&entry->entry); track_entry_destroy(entry); } - - if (This->wave_data) - free(This->wave_data); - + free(This->wave_data); free(This); }

1 0

Michael Stefaniuc : dmime/tests: Remove superfluous casts to self.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: e28388305746cf7c60ff04fb0d11f4e90a2ef707 URL: https://gitlab.winehq.org/wine/wine/-/commit/e28388305746cf7c60ff04fb0d11f4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 13 19:31:03 2023 +0100 dmime/tests: Remove superfluous casts to self. --- dlls/dmime/tests/dmime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index bfb41d322e8..e1d88c11d62 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -2571,7 +2571,7 @@ static void test_performance_graph(void) /* performance exposes a graph interface but it's not an actual toolgraph */ hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == E_NOTIMPL, "got %#lx\n", hr); hr = IDirectMusicGraph_GetTool(graph, 0, &tmp_tool); ok(hr == E_NOTIMPL, "got %#lx\n", hr); @@ -2628,7 +2628,7 @@ static void test_performance_graph(void) ok(tmp_graph == graph, "got %p\n", graph); IDirectMusicGraph_Release(tmp_graph); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph); @@ -2830,7 +2830,7 @@ static void test_performance_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SetGraph(performance, graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph); @@ -3111,7 +3111,7 @@ static void test_notification_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SetGraph(performance, graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph); @@ -3411,7 +3411,7 @@ static void test_wave_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SetGraph(performance, graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph); @@ -4286,7 +4286,7 @@ static void test_segment_state(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SetGraph(performance, graph); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicGraph_Release(graph);

1 0

Michael Stefaniuc : dmime: Remove superfluous casts to self.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: b3382916c6b7d2fe2b338d7b84c1aff780179134 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3382916c6b7d2fe2b338d7b84c1af… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 13 19:31:51 2023 +0100 dmime: Remove superfluous casts to self. --- dlls/dmime/performance.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 0a39e86ef96..f4504c4d36f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1545,7 +1545,7 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi IDirectSound_AddRef(*dsound); } if (dmusic && !*dmusic) { - *dmusic = (IDirectMusic *)This->dmusic; + *dmusic = This->dmusic; IDirectMusic_AddRef(*dmusic); } @@ -2117,7 +2117,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, msg->dwFlags &= ~DMUS_PMSGF_TOOL_IMMEDIATE; msg->dwFlags |= DMUS_PMSGF_TOOL_ATTIME; - if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)msg))) + if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, msg))) { ERR("Failed to send notification message, hr %#lx\n", hr); return DMUS_S_FREE;

1 0

Michael Stefaniuc : dmsynth: Remove superfluous casts to self.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: ad1ba07880a234b43089423c925b5179641bedf8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad1ba07880a234b43089423c925b51… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 13 19:33:30 2023 +0100 dmsynth: Remove superfluous casts to self. --- dlls/dmsynth/synthsink.c | 2 +- dlls/dmsynth/tests/dmsynth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index d0a89358652..9263ff56349 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -320,7 +320,7 @@ static HRESULT synth_sink_activate(struct synth_sink *This) else { synth_sink_get_format(This, &format); - desc.lpwfxFormat = (WAVEFORMATEX *)&format; + desc.lpwfxFormat = &format; desc.dwBufferBytes = format.nAvgBytesPerSec; if (FAILED(hr = IDirectMusicSynthSink_GetDesiredBufferSize(iface, &desc.dwBufferBytes))) ERR("Failed to get desired buffer size, hr %#lx\n", hr); diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index ad09a651094..ad9f706aada 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -1134,11 +1134,11 @@ static void test_IDirectMusicSynth(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IReferenceClock_GetTime(latency_clock, &time); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicBuffer_GetRawBufferPtr(buffer, (BYTE **)&raw); + hr = IDirectMusicBuffer_GetRawBufferPtr(buffer, &raw); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicBuffer_GetUsedBytes(buffer, &len); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicSynth_PlayBuffer(synth, time, (BYTE *)raw, len); + hr = IDirectMusicSynth_PlayBuffer(synth, time, raw, len); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicBuffer_Release(buffer); IReferenceClock_Release(latency_clock);

1 0

Michael Stefaniuc : dmusic: Remove superfluous casts to self.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 055e6322161a40b14103da5ed7e03404294cca83 URL: https://gitlab.winehq.org/wine/wine/-/commit/055e6322161a40b14103da5ed7e034… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 13 19:34:31 2023 +0100 dmusic: Remove superfluous casts to self. --- dlls/dmusic/dmobject.c | 2 +- dlls/dmusic/tests/dmusic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index 8cb4719c4e6..9ba1f239167 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -466,7 +466,7 @@ HRESULT stream_get_object(IStream *stream, DMUS_OBJECTDESC *desc, REFIID iid, vo if (SUCCEEDED(hr = stream_get_loader(stream, &loader))) { - hr = IDirectMusicLoader_GetObject(loader, desc, iid, (void **)ret_iface); + hr = IDirectMusicLoader_GetObject(loader, desc, iid, ret_iface); IDirectMusicLoader_Release(loader); } diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index f71c0600366..3b2f7d9160e 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -1078,7 +1078,7 @@ static void test_port_download(void) ok(hr == S_OK, "got %#lx\n", hr); size = 0xdeadbeef; buffer = invalid_ptr; - hr = IDirectMusicDownload_GetBuffer(download, (void **)&buffer, &size); + hr = IDirectMusicDownload_GetBuffer(download, &buffer, &size); ok(hr == S_OK, "got %#lx\n", hr); ok(size == 1, "got %#lx\n", size); ok(buffer != invalid_ptr, "got %p\n", buffer);

1 0

Rémi Bernon : gitlab: Install libxkbcommon and libxkbregistry dependencies.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 677868a0c7e8e15dc037090e22435afb6fa9ecc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/677868a0c7e8e15dc037090e22435a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 15 12:55:22 2023 +0200 gitlab: Install libxkbcommon and libxkbregistry dependencies. --- tools/gitlab/image.docker | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index 50607d13872..8ff9055df2f 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -42,6 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libxext-dev:amd64 libxext-dev:i386 \ libxi-dev:amd64 libxi-dev:i386 \ libxinerama-dev:amd64 libxinerama-dev:i386 \ + libxkbcommon-dev:amd64 libxkbcommon-dev:i386 \ + libxkbregistry-dev:amd64 libxkbregistry-dev:i386 \ libxrandr-dev:amd64 libxrandr-dev:i386 \ libxrender-dev:amd64 libxrender-dev:i386 \ libxxf86vm-dev:amd64 libxxf86vm-dev:i386 \

1 0

Rémi Bernon : winewayland.drv: Basic handling of Wayland keyboard events.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: f58946e3baf65f5de2c081cd2c4416b3a2bc0f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/f58946e3baf65f5de2c081cd2c4416… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 9 23:28:27 2023 +0100 winewayland.drv: Basic handling of Wayland keyboard events. Handle Wayland keyboard events and translate them to Windows events, currently using a hardcoded US key mapping. --- configure | 91 ++++++++++- configure.ac | 5 +- dlls/winewayland.drv/Makefile.in | 5 +- dlls/winewayland.drv/wayland.c | 6 + dlls/winewayland.drv/wayland_keyboard.c | 274 ++++++++++++++++++++++++++++++++ dlls/winewayland.drv/wayland_surface.c | 5 + dlls/winewayland.drv/waylanddrv.h | 17 ++ include/config.h.in | 3 + 8 files changed, 402 insertions(+), 4 deletions(-)

1 0

Alistair Leslie-Hughes : rpcrt4: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 9b26ea16a3fc13118c4c4eaab6ea46d3828ea503 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b26ea16a3fc13118c4c4eaab6ea46… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 9 18:26:22 2023 +1100 rpcrt4: Remove DECLSPEC_HIDDEN usage. --- dlls/rpcrt4/cpsf.h | 30 ++++++++++---------- dlls/rpcrt4/ndr_misc.h | 14 +++++----- dlls/rpcrt4/ndr_stubless.c | 12 ++++---- dlls/rpcrt4/ndr_stubless.h | 12 ++++---- dlls/rpcrt4/rpc_assoc.h | 24 ++++++++-------- dlls/rpcrt4/rpc_binding.h | 70 +++++++++++++++++++++++----------------------- dlls/rpcrt4/rpc_message.h | 56 ++++++++++++++++++------------------- dlls/rpcrt4/rpc_server.h | 8 +++--- 8 files changed, 113 insertions(+), 113 deletions(-)

1 0

Alexandre Julliard : makefiles: Avoid generating the .tab.c file twice with bison.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: aea0d88ae54462689fb03f0a5dc22a2921bdad54 URL: https://gitlab.winehq.org/wine/wine/-/commit/aea0d88ae54462689fb03f0a5dc22a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 13:04:36 2023 +0100 makefiles: Avoid generating the .tab.c file twice with bison. --- tools/makedep.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7b76a3283f0..640b4e63ece 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2680,20 +2680,17 @@ static void output_po_files( struct makefile *make ) */ static void output_source_y( struct makefile *make, struct incl_file *source, const char *obj ) { - /* add source file dependency for parallel makes */ char *header = strmake( "%s.tab.h", obj ); if (find_include_file( make, header )) { output( "%s: %s\n", obj_dir_path( make, header ), source->filename ); - output( "\t%s%s -o %s.tab.c -d %s\n", - cmd_prefix( "BISON" ), bison, obj_dir_path( make, obj ), source->filename ); - output( "%s.tab.c: %s %s\n", obj_dir_path( make, obj ), - source->filename, obj_dir_path( make, header )); + output( "\t%s%s -o %s.tab.$$$$.c --header=$@ %s && rm -f %s.tab.$$$$.c\n", + cmd_prefix( "BISON" ), bison, obj_dir_path( make, obj ), + source->filename, obj_dir_path( make, obj )); strarray_add( &make->clean_files, header ); } - else output( "%s.tab.c: %s\n", obj_dir_path( make, obj ), source->filename ); - + output( "%s.tab.c: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s%s -o $@ %s\n", cmd_prefix( "BISON" ), bison, source->filename ); }

1 0