- Wine-Commits - list.winehq.org

Rémi Bernon : fluidsynth: Use Wine debugging facility for traces.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: b5903214ab6f564acadaee5c4c934f8a72e442c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5903214ab6f564acadaee5c4c934f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 8 10:05:28 2023 +0200 fluidsynth: Use Wine debugging facility for traces. --- libs/fluidsynth/src/utils/fluid_sys.c | 2 +- libs/fluidsynth/src/utils/fluidsynth_priv.h | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/libs/fluidsynth/src/utils/fluid_sys.c b/libs/fluidsynth/src/utils/fluid_sys.c index e94123022b2..0f8e6a608fc 100644 --- a/libs/fluidsynth/src/utils/fluid_sys.c +++ b/libs/fluidsynth/src/utils/fluid_sys.c @@ -640,7 +640,7 @@ void fluid_profiling_print(void) { int i; - printf("fluid_profiling_print\n"); + FLUID_LOG(FLUID_INFO, "fluid_profiling_print\n"); FLUID_LOG(FLUID_INFO, "Estimated times: min/avg/max (micro seconds)"); diff --git a/libs/fluidsynth/src/utils/fluidsynth_priv.h b/libs/fluidsynth/src/utils/fluidsynth_priv.h index 843c0143475..1191ac59595 100644 --- a/libs/fluidsynth/src/utils/fluidsynth_priv.h +++ b/libs/fluidsynth/src/utils/fluidsynth_priv.h @@ -51,6 +51,10 @@ #include "fluidsynth.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fluidsynth); + #ifdef __cplusplus extern "C" { #endif @@ -275,8 +279,8 @@ do { strncpy(_dst,_src,_n-1); \ #define FLUID_PRINTF post #define FLUID_FLUSH() #else -#define FLUID_PRINTF printf -#define FLUID_FLUSH() fflush(stdout) +#define FLUID_PRINTF WINE_TRACE +#define FLUID_FLUSH() #endif /* People who want to reduce the size of the may do this by entirely @@ -287,7 +291,12 @@ do { strncpy(_dst,_src,_n-1); \ #if 0 #define FLUID_LOG (void)sizeof #else -#define FLUID_LOG fluid_log +#define WINE_FLUID_DBG WINE_TRACE +#define WINE_FLUID_INFO WINE_TRACE +#define WINE_FLUID_WARN WINE_WARN +#define WINE_FLUID_ERR WINE_ERR +#define WINE_FLUID_PANIC WINE_ERR +#define FLUID_LOG( x, msg, ... ) do { WINE_ ## x( msg, ## __VA_ARGS__ ); WINE_ ## x( "\n" ); } while (0) #endif #if defined(DEBUG) && !defined(NDEBUG)

1 0

Rémi Bernon : dmsynth: Create a fluid_synth instance on Open.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 3cfa740cd73200577fe8109aa02d2e17f0298fe5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3cfa740cd73200577fe8109aa02d2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 2 08:59:32 2023 +0200 dmsynth: Create a fluid_synth instance on Open. --- dlls/dmsynth/synth.c | 9 ++++++++- dlls/dmsynth/tests/dmsynth.c | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 505f1387b41..48aa175698d 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -232,6 +232,7 @@ struct synth struct list waves; fluid_settings_t *fluid_settings; + fluid_synth_t *fluid_synth; }; static inline struct synth *impl_from_IDirectMusicSynth8(IDirectMusicSynth8 *iface) @@ -351,7 +352,8 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par if ((params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS) && params->dwAudioChannels) { - actual.dwAudioChannels = min(params->dwAudioChannels, This->caps.dwMaxAudioChannels); + /* FluidSynth only works with stereo */ + actual.dwAudioChannels = 2; modified |= actual.dwAudioChannels != params->dwAudioChannels; } @@ -384,6 +386,9 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par memcpy(params, &actual, size); } + fluid_settings_setnum(This->fluid_settings, "synth.sample-rate", actual.dwSampleRate); + if (!(This->fluid_synth = new_fluid_synth(This->fluid_settings))) return E_OUTOFMEMORY; + This->params = actual; This->open = TRUE; @@ -399,6 +404,8 @@ static HRESULT WINAPI synth_Close(IDirectMusicSynth8 *iface) if (!This->open) return DMUS_E_ALREADYCLOSED; + delete_fluid_synth(This->fluid_synth); + This->fluid_synth = NULL; This->open = FALSE; return S_OK; diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 64a81e33b43..26619560b42 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -437,7 +437,7 @@ static void test_dmsynth(void) ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); ok(params.dwVoices == 1, "dwVoices: %ld\n", params.dwVoices); ok(params.dwChannelGroups == 1, "dwChannelGroups: %ld\n", params.dwChannelGroups); - ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels); + todo_wine ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels); ok(params.dwSampleRate == 11025, "dwSampleRate: %ld\n", params.dwSampleRate); test_synth_getformat(dmsynth, &params, "min"); IDirectMusicSynth_Close(dmsynth); @@ -525,7 +525,7 @@ static void test_dmsynth(void) params.dwValidParams = DMUS_PORTPARAMS_AUDIOCHANNELS; params.dwAudioChannels = 1; hr = IDirectMusicSynth_Open(dmsynth, &params); - ok(hr == S_OK, "Open failed: %#lx\n", hr); + todo_wine_if(SUCCEEDED(hr)) ok(hr == S_OK, "Open failed: %#lx\n", hr); hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size); ok(hr == S_OK, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); ok(size == params.dwSampleRate * params.dwAudioChannels * 4, "size: %ld\n", size);

1 0

Paul Gofman : ntdll: Implement NtQueryValueKey(KeyValuePartialInformationAlign64).
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: b15680a05e6557413b81c0827f7455ace6903cb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b15680a05e6557413b81c0827f7455… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 5 18:21:13 2023 -0600 ntdll: Implement NtQueryValueKey(KeyValuePartialInformationAlign64). --- dlls/ntdll/tests/reg.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/registry.c | 15 +++++++++++++++ include/winternl.h | 6 ++++++ 3 files changed, 58 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 978d50dbd0d..0d1ffbb4ff6 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -768,6 +768,7 @@ static void test_NtQueryValueKey(void) UNICODE_STRING ValName; KEY_VALUE_BASIC_INFORMATION *basic_info; KEY_VALUE_PARTIAL_INFORMATION *partial_info, pi; + KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *aligned_info; KEY_VALUE_FULL_INFORMATION *full_info; DWORD len, expected; @@ -815,6 +816,42 @@ static void test_NtQueryValueKey(void) ok(*(DWORD *)partial_info->Data == 711, "incorrect Data returned: 0x%lx\n", *(DWORD *)partial_info->Data); HeapFree(GetProcessHeap(), 0, partial_info); + len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[0]); + aligned_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*aligned_info) + 4); + + aligned_info = (KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)((char *)aligned_info + 4); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformationAlign64, aligned_info, len, &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08lx\n", status); + ok(aligned_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", aligned_info->Type); + ok(aligned_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", aligned_info->DataLength); + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[aligned_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len); + + len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[0]); + aligned_info = (KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)((char *)aligned_info - 4); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformationAlign64, aligned_info, len, &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08lx\n", status); + ok(aligned_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", aligned_info->Type); + ok(aligned_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", aligned_info->DataLength); + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[aligned_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len); + + aligned_info = HeapReAlloc(GetProcessHeap(), 0, aligned_info, len + 4); + aligned_info = (KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)((char *)aligned_info + 4); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformationAlign64, aligned_info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08lx\n", status); + ok(aligned_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", aligned_info->Type); + ok(aligned_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", aligned_info->DataLength); + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[aligned_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len); + ok(*(DWORD *)aligned_info->Data == 711, "incorrect Data returned: 0x%lx\n", *(DWORD *)aligned_info->Data); + + aligned_info = (KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)((char *)aligned_info - 4); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformationAlign64, aligned_info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08lx\n", status); + ok(aligned_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", aligned_info->Type); + ok(aligned_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", aligned_info->DataLength); + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data[aligned_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len); + ok(*(DWORD *)aligned_info->Data == 711, "incorrect Data returned: 0x%lx\n", *(DWORD *)aligned_info->Data); + HeapFree(GetProcessHeap(), 0, aligned_info); + len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); full_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*full_info)); status = pNtQueryValueKey(key, &ValName, KeyValueFullInformation, full_info, len, &len); diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 3646d32c0a6..fe629b5e3b4 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -425,6 +425,16 @@ static void copy_key_value_info( KEY_VALUE_INFORMATION_CLASS info_class, void *i break; } + case KeyValuePartialInformationAlign64: + { + KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 keyinfo; + keyinfo.Type = type; + keyinfo.DataLength = data_len; + length = min( length, (char *)keyinfo.Data - (char *)&keyinfo ); + memcpy( info, &keyinfo, length ); + break; + } + default: break; } @@ -519,6 +529,11 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, data_ptr = ((KEY_VALUE_PARTIAL_INFORMATION *)info)->Data; break; + case KeyValuePartialInformationAlign64: + min_size = fixed_size = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, Data); + data_ptr = ((KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 *)info)->Data; + break; + default: FIXME( "Information class %d not implemented\n", info_class ); return STATUS_INVALID_PARAMETER; diff --git a/include/winternl.h b/include/winternl.h index 31785e2719e..d50bc730660 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2460,6 +2460,12 @@ typedef struct _KEY_VALUE_PARTIAL_INFORMATION { UCHAR Data[1]; } KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION; +typedef struct _KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 { + ULONG Type; + ULONG DataLength; + UCHAR Data[1]; +} KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, *PKEY_VALUE_PARTIAL_INFORMATION_ALIGN64; + #ifndef __OBJECT_ATTRIBUTES_DEFINED__ #define __OBJECT_ATTRIBUTES_DEFINED__ typedef struct _OBJECT_ATTRIBUTES {

1 0

Rémi Bernon : dmime/tests: Queue the message before calling SendPMsg twice.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: d0c3a0e03d557498195a70693003deae5b3e4588 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0c3a0e03d557498195a70693003de… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 3 15:13:28 2023 +0200 dmime/tests: Queue the message before calling SendPMsg twice. --- dlls/dmime/tests/dmime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index cb35ef64ead..e390f86f1bf 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -2849,7 +2849,7 @@ static void test_performance_pmsg(void) ok(clone != NULL, "got %p\n", clone); msg->mtTime = 500; - msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE; hr = IDirectMusicPerformance_SendPMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_SendPMsg(performance, msg);

1 0

Rémi Bernon : dmsynth: Import and use FluidSynth 2.3.3.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: f768d6b31bebc35fbaf751d0cd57c8bd302a8d60 URL: https://gitlab.winehq.org/wine/wine/-/commit/f768d6b31bebc35fbaf751d0cd57c8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 17 19:35:28 2023 +0200 dmsynth: Import and use FluidSynth 2.3.3. --- configure | 139 + configure.ac | 11 + dlls/dmsynth/Makefile.in | 3 +- dlls/dmsynth/synth.c | 11 + libs/fluidsynth/AUTHORS | 157 + libs/fluidsynth/COPYING.md | 7 + libs/fluidsynth/Makefile.in | 42 + libs/fluidsynth/config.h | 271 + libs/fluidsynth/fluid_conv_tables.inc.h | 3915 ++++++++++ libs/fluidsynth/fluid_rvoice_dsp_tables.inc.h | 4109 +++++++++++ libs/fluidsynth/glib.c | 106 + libs/fluidsynth/glib.h | 107 + libs/fluidsynth/include/fluidsynth.h | 125 + libs/fluidsynth/include/fluidsynth/audio.h | 155 + libs/fluidsynth/include/fluidsynth/event.h | 143 + libs/fluidsynth/include/fluidsynth/gen.h | 133 + libs/fluidsynth/include/fluidsynth/ladspa.h | 68 + libs/fluidsynth/include/fluidsynth/log.h | 97 + libs/fluidsynth/include/fluidsynth/midi.h | 295 + libs/fluidsynth/include/fluidsynth/misc.h | 77 + libs/fluidsynth/include/fluidsynth/mod.h | 104 + libs/fluidsynth/include/fluidsynth/seq.h | 92 + libs/fluidsynth/include/fluidsynth/seqbind.h | 44 + libs/fluidsynth/include/fluidsynth/settings.h | 194 + libs/fluidsynth/include/fluidsynth/sfont.h | 362 + libs/fluidsynth/include/fluidsynth/shell.h | 150 + libs/fluidsynth/include/fluidsynth/synth.h | 552 ++ libs/fluidsynth/include/fluidsynth/types.h | 85 + libs/fluidsynth/include/fluidsynth/version.h | 47 + libs/fluidsynth/include/fluidsynth/voice.h | 76 + libs/fluidsynth/src/bindings/fluid_ladspa.h | 36 + libs/fluidsynth/src/midi/fluid_midi.c | 2851 ++++++++ libs/fluidsynth/src/midi/fluid_midi.h | 384 + libs/fluidsynth/src/midi/fluid_midi_router.h | 32 + libs/fluidsynth/src/rvoice/fluid_adsr_env.c | 38 + libs/fluidsynth/src/rvoice/fluid_adsr_env.h | 166 + libs/fluidsynth/src/rvoice/fluid_chorus.c | 1071 +++ libs/fluidsynth/src/rvoice/fluid_chorus.h | 80 + libs/fluidsynth/src/rvoice/fluid_iir_filter.c | 418 ++ libs/fluidsynth/src/rvoice/fluid_iir_filter.h | 74 + libs/fluidsynth/src/rvoice/fluid_lfo.c | 17 + libs/fluidsynth/src/rvoice/fluid_lfo.h | 74 + libs/fluidsynth/src/rvoice/fluid_phase.h | 113 + libs/fluidsynth/src/rvoice/fluid_rev.c | 1523 ++++ libs/fluidsynth/src/rvoice/fluid_rev.h | 91 + libs/fluidsynth/src/rvoice/fluid_rvoice.c | 935 +++ libs/fluidsynth/src/rvoice/fluid_rvoice.h | 231 + libs/fluidsynth/src/rvoice/fluid_rvoice_dsp.c | 636 ++ libs/fluidsynth/src/rvoice/fluid_rvoice_event.c | 202 + libs/fluidsynth/src/rvoice/fluid_rvoice_event.h | 114 + libs/fluidsynth/src/rvoice/fluid_rvoice_mixer.c | 1727 +++++ libs/fluidsynth/src/rvoice/fluid_rvoice_mixer.h | 87 + libs/fluidsynth/src/sfloader/fluid_defsfont.c | 2372 ++++++ libs/fluidsynth/src/sfloader/fluid_defsfont.h | 232 + libs/fluidsynth/src/sfloader/fluid_instpatch.h | 14 + libs/fluidsynth/src/sfloader/fluid_samplecache.c | 313 + libs/fluidsynth/src/sfloader/fluid_samplecache.h | 37 + libs/fluidsynth/src/sfloader/fluid_sffile.c | 2527 +++++++ libs/fluidsynth/src/sfloader/fluid_sffile.h | 194 + libs/fluidsynth/src/sfloader/fluid_sfont.c | 850 +++ libs/fluidsynth/src/sfloader/fluid_sfont.h | 189 + libs/fluidsynth/src/synth/fluid_chan.c | 732 ++ libs/fluidsynth/src/synth/fluid_chan.h | 276 + libs/fluidsynth/src/synth/fluid_event.c | 863 +++ libs/fluidsynth/src/synth/fluid_event.h | 65 + libs/fluidsynth/src/synth/fluid_gen.c | 133 + libs/fluidsynth/src/synth/fluid_gen.h | 67 + libs/fluidsynth/src/synth/fluid_mod.c | 880 +++ libs/fluidsynth/src/synth/fluid_mod.h | 54 + libs/fluidsynth/src/synth/fluid_synth.c | 8445 ++++++++++++++++++++++ libs/fluidsynth/src/synth/fluid_synth.h | 263 + libs/fluidsynth/src/synth/fluid_synth_monopoly.c | 722 ++ libs/fluidsynth/src/synth/fluid_tuning.c | 190 + libs/fluidsynth/src/synth/fluid_tuning.h | 69 + libs/fluidsynth/src/synth/fluid_voice.c | 2051 ++++++ libs/fluidsynth/src/synth/fluid_voice.h | 198 + libs/fluidsynth/src/utils/fluid_conv.c | 333 + libs/fluidsynth/src/utils/fluid_conv.h | 40 + libs/fluidsynth/src/utils/fluid_conv_tables.h | 41 + libs/fluidsynth/src/utils/fluid_hash.c | 1407 ++++ libs/fluidsynth/src/utils/fluid_hash.h | 130 + libs/fluidsynth/src/utils/fluid_list.c | 337 + libs/fluidsynth/src/utils/fluid_list.h | 63 + libs/fluidsynth/src/utils/fluid_ringbuffer.c | 90 + libs/fluidsynth/src/utils/fluid_ringbuffer.h | 133 + libs/fluidsynth/src/utils/fluid_settings.c | 2004 +++++ libs/fluidsynth/src/utils/fluid_settings.h | 65 + libs/fluidsynth/src/utils/fluid_sys.c | 1803 +++++ libs/fluidsynth/src/utils/fluid_sys.h | 794 ++ libs/fluidsynth/src/utils/fluidsynth_priv.h | 331 + 90 files changed, 51883 insertions(+), 1 deletion(-)

1 0

Francois Gouget : winewayland.drv: Add a trailing linefeed to a TRACE() message.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 484bf58e8d44bc2f292eda201bdf384df82143a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/484bf58e8d44bc2f292eda201bdf38… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 6 09:34:16 2023 +0200 winewayland.drv: Add a trailing linefeed to a TRACE() message. --- dlls/winewayland.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 5079d820929..0cb3ba3a15a 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -342,7 +342,7 @@ static void wayland_configure_window(HWND hwnd) if (!surface->xdg_toplevel) { - TRACE("missing xdg_toplevel, returning"); + TRACE("missing xdg_toplevel, returning\n"); pthread_mutex_unlock(&surface->mutex); return; }

1 0

Francois Gouget : dmsynth: Add a trailing linefeed to TRACE() messages.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 622daeaf89a08a6073fbb2202b57e64e305d5213 URL: https://gitlab.winehq.org/wine/wine/-/commit/622daeaf89a08a6073fbb2202b57e6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 6 09:37:47 2023 +0200 dmsynth: Add a trailing linefeed to TRACE() messages. --- dlls/dmsynth/synth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index a3243d4b683..a3bec8bf3ed 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -79,8 +79,8 @@ static void dump_connectionlist(CONNECTIONLIST *list) UINT i; TRACE("CONNECTIONLIST:\n"); - TRACE(" - cbSize = %lu", list->cbSize); - TRACE(" - cConnections = %lu", list->cConnections); + TRACE(" - cbSize = %lu\n", list->cbSize); + TRACE(" - cConnections = %lu\n", list->cConnections); for (i = 0; i < list->cConnections; i++) {

1 0

Francois Gouget : nsiproxy.sys: Add a trailing linefeed to a TRACE() message.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 9878b47bd00551fd2d2629782a5760f1d18ce7ea URL: https://gitlab.winehq.org/wine/wine/-/commit/9878b47bd00551fd2d2629782a5760… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 9 15:23:51 2023 +0200 nsiproxy.sys: Add a trailing linefeed to a TRACE() message. --- dlls/nsiproxy.sys/ip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index c904f9158fe..c5d1c596246 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -1569,7 +1569,7 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void BOOL want_data = key_size || rw_size || dynamic_size || static_size; struct ipv6_route_data entry; - TRACE( "%p %d %p %d %p %d %p %d %p" , key_data, key_size, rw_data, rw_size, + TRACE( "%p %d %p %d %p %d %p %d %p\n" , key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); #ifdef __linux__

1 0

Nikolay Sivov : vkd3d: Add partial implementation for CreateCommittedResource1().
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: vkd3d Branch: master Commit: 9c6c7cb78fa6c6106b1a583d70be9f2052dcd210 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c6c7cb78fa6c6106b1a583d70be9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 17:13:40 2023 +0200 vkd3d: Add partial implementation for CreateCommittedResource1(). --- libs/vkd3d/device.c | 19 +++++++++++++++---- libs/vkd3d/resource.c | 6 +++++- libs/vkd3d/vkd3d_private.h | 3 ++- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3e17400a..2d7051f3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3626,7 +3626,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Devi optimized_clear_value, debugstr_guid(iid), resource); if (FAILED(hr = d3d12_committed_resource_create(device, heap_properties, heap_flags, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, NULL, &object))) { *resource = NULL; return hr; @@ -4012,12 +4012,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource1(ID3D12Dev const D3D12_CLEAR_VALUE *optimized_clear_value, ID3D12ProtectedResourceSession *protected_session, REFIID iid, void **resource) { - FIXME("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " - "optimized_clear_value %p, protected_session %p, iid %s, resource %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device5(iface); + struct d3d12_resource *object; + HRESULT hr; + + TRACE("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " + "optimized_clear_value %p, protected_session %p, iid %s, resource %p.\n", iface, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, protected_session, debugstr_guid(iid), resource); - return E_NOTIMPL; + if (FAILED(hr = d3d12_committed_resource_create(device, heap_properties, heap_flags, + desc, initial_state, optimized_clear_value, protected_session, &object))) + { + *resource = NULL; + return hr; + } + + return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap1(ID3D12Device5 *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ad1d2d66..8898c247 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2076,7 +2076,8 @@ static HRESULT vkd3d_allocate_resource_memory( HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) + const D3D12_CLEAR_VALUE *optimized_clear_value, ID3D12ProtectedResourceSession *protected_session, + struct d3d12_resource **resource) { struct d3d12_resource *object; HRESULT hr; @@ -2087,6 +2088,9 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, return E_INVALIDARG; } + if (protected_session) + FIXME("Protected session is not supported.\n"); + if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, &object))) return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 625a4312..2e9845df 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -773,7 +773,8 @@ void d3d12_resource_get_tiling(struct d3d12_device *device, const struct d3d12_r HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); + const D3D12_CLEAR_VALUE *optimized_clear_value, ID3D12ProtectedResourceSession *protected_session, + struct d3d12_resource **resource); HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); diff --git a/tests/d3d12.c b/tests/d3d12.c index 3fa9ec4e..bfbbf804 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1547,6 +1547,7 @@ static void test_create_committed_resource(void) D3D12_CLEAR_VALUE clear_value; D3D12_RESOURCE_STATES state; ID3D12Resource *resource; + ID3D12Device4 *device4; unsigned int i; ULONG refcount; HRESULT hr; @@ -1837,6 +1838,38 @@ static void test_create_committed_resource(void) ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); } + if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device4, (void **)&device4))) + { + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + + hr = ID3D12Device4_CreateCommittedResource1(device4, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); + ID3D12Resource_Release(resource); + + ID3D12Device4_Release(device4); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Zebediah Figura : include: Fix some confusingly structured documentation.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: vkd3d Branch: master Commit: 72e8b6e0dce8e0422483f69e3e9a18e3a8414e9c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72e8b6e0dce8e0422483f69e3e9a1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 9 17:15:11 2023 -0500 include: Fix some confusingly structured documentation. Fixes: 7a4ae434dfa4cccc1e832455133930066d2ab575. --- include/vkd3d_shader.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 9d0d768b..f112e7c7 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1387,7 +1387,10 @@ struct vkd3d_shader_descriptor_info * as follows: * * - Each constant register set used by the shader is scanned as a single - * constant buffer descriptor, as follows: + * constant buffer descriptor. + * There may therefore be up to three such descriptors, one for each register + * set used by the shader: float, integer, and boolean. + * The fields are set as follows: * * The \ref vkd3d_shader_descriptor_info.type field is set to * VKD3D_SHADER_DESCRIPTOR_TYPE_CBV. * * The \ref vkd3d_shader_descriptor_info.register_space field is set to zero. @@ -1407,9 +1410,6 @@ struct vkd3d_shader_descriptor_info * * The \ref vkd3d_shader_descriptor_info.register_index field is set to the * binding index of the original sampler, for both descriptors. * * The \ref vkd3d_shader_descriptor_info.count field is set to one. - * - * In summary, there may be up to three such descriptors, one for each register - * set used by the shader: float, integer, and boolean. */ struct vkd3d_shader_scan_descriptor_info {

1 0