October 2023 - Wine-Commits

Alexandre Julliard : include: Stop pretending to support big-endian.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 3bb752736c4743754a6203293dcb62b52a1757c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bb752736c4743754a6203293dcb62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 11:11:26 2023 +0200 include: Stop pretending to support big-endian. --- include/basetsd.h | 32 -------------------------------- include/mapidefs.h | 10 ---------- include/winbase.h | 15 --------------- include/windef.h | 10 ---------- include/winnt.h | 28 ++-------------------------- include/winternl.h | 5 ----- include/winuser.h | 6 ------ include/wtypes.idl | 10 ---------- 8 files changed, 2 insertions(+), 114 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 55e900d4f8e..c16d55422bb 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -295,38 +295,6 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; #define MINLONGLONG ((LONGLONG)~MAXLONGLONG) -/* Some Wine-specific definitions */ - -/* Architecture dependent settings. */ -/* These are hardcoded to avoid dependencies on config.h in Winelib apps. */ -#if defined(__i386__) -# undef WORDS_BIGENDIAN -#elif defined(__x86_64__) -# undef WORDS_BIGENDIAN -#elif defined(__powerpc64__) && defined(__BIG_ENDIAN__) -# define WORDS_BIGENDIAN -#elif defined(__powerpc64__) -# undef WORDS_BIGENDIAN -#elif defined(__powerpc__) -# define WORDS_BIGENDIAN -#elif defined(__ALPHA__) -# undef WORDS_BIGENDIAN -#elif defined(__ARMEB__) -# define WORDS_BIGENDIAN -#elif defined(__ARMEL__) || defined(__arm__) -# undef WORDS_BIGENDIAN -#elif defined(__AARCH64EB__) -# define WORDS_BIGENDIAN -#elif defined(__AARCH64EL__) || defined(__aarch64__) -# undef WORDS_BIGENDIAN -#elif defined(__MIPSEB__) -# define WORDS_BIGENDIAN -#elif defined(__MIPSEL__) -# undef WORDS_BIGENDIAN -#elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl) -# error Unknown CPU architecture! -#endif - #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/include/mapidefs.h b/include/mapidefs.h index 84e0f2d7447..e3e2bd40b5f 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -37,13 +37,8 @@ typedef union tagCY { struct { -#ifdef WORDS_BIGENDIAN - LONG Hi; - ULONG Lo; -#else ULONG Lo; LONG Hi; -#endif } DUMMYSTRUCTNAME; LONGLONG int64; } CY; @@ -55,13 +50,8 @@ typedef CY CURRENCY; #define _FILETIME_ typedef struct _FILETIME { -#ifdef WORDS_BIGENDIAN - DWORD dwHighDateTime; - DWORD dwLowDateTime; -#else DWORD dwLowDateTime; DWORD dwHighDateTime; -#endif } FILETIME, *PFILETIME, *LPFILETIME; #endif diff --git a/include/winbase.h b/include/winbase.h index 4429fac21c7..5f005fcd82b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -252,13 +252,8 @@ typedef struct _SECURITY_ATTRIBUTES /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ typedef struct _FILETIME { -#ifdef WORDS_BIGENDIAN - DWORD dwHighDateTime; - DWORD dwLowDateTime; -#else DWORD dwLowDateTime; DWORD dwHighDateTime; -#endif } FILETIME, *PFILETIME, *LPFILETIME; #endif /* _FILETIME_ */ @@ -556,22 +551,12 @@ typedef struct _SYSTEMTIME{ /* The 'overlapped' data structure used by async I/O functions. */ typedef struct _OVERLAPPED { -#ifdef WORDS_BIGENDIAN - ULONG_PTR InternalHigh; - ULONG_PTR Internal; -#else ULONG_PTR Internal; ULONG_PTR InternalHigh; -#endif union { struct { -#ifdef WORDS_BIGENDIAN - DWORD OffsetHigh; - DWORD Offset; -#else DWORD Offset; DWORD OffsetHigh; -#endif } DUMMYSTRUCTNAME; PVOID Pointer; } DUMMYUNIONNAME; diff --git a/include/windef.h b/include/windef.h index cce3dbb36f4..b22e15c4dbf 100644 --- a/include/windef.h +++ b/include/windef.h @@ -390,23 +390,13 @@ typedef struct _POINTL typedef struct tagPOINTS { -#ifdef WORDS_BIGENDIAN - SHORT y; - SHORT x; -#else SHORT x; SHORT y; -#endif } POINTS, *PPOINTS, *LPPOINTS; typedef struct _FILETIME { -#ifdef WORDS_BIGENDIAN - DWORD dwHighDateTime; - DWORD dwLowDateTime; -#else DWORD dwLowDateTime; DWORD dwHighDateTime; -#endif } FILETIME, *PFILETIME, *LPFILETIME; #define _FILETIME_ diff --git a/include/winnt.h b/include/winnt.h index d8690d313ba..6ff508215dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4788,49 +4788,25 @@ typedef struct _TOKEN_GROUPS { typedef union _LARGE_INTEGER { struct { -#ifdef WORDS_BIGENDIAN - LONG HighPart; - DWORD LowPart; -#else DWORD LowPart; LONG HighPart; -#endif } u; -#ifndef NONAMELESSSTRUCT struct { -#ifdef WORDS_BIGENDIAN - LONG HighPart; - DWORD LowPart; -#else DWORD LowPart; LONG HighPart; -#endif - }; -#endif + } DUMMYSTRUCTNAME; LONGLONG QuadPart; } LARGE_INTEGER, *PLARGE_INTEGER; typedef union _ULARGE_INTEGER { struct { -#ifdef WORDS_BIGENDIAN - DWORD HighPart; - DWORD LowPart; -#else DWORD LowPart; DWORD HighPart; -#endif } u; -#ifndef NONAMELESSSTRUCT struct { -#ifdef WORDS_BIGENDIAN - DWORD HighPart; - DWORD LowPart; -#else DWORD LowPart; DWORD HighPart; -#endif - }; -#endif + } DUMMYSTRUCTNAME; ULONGLONG QuadPart; } ULARGE_INTEGER, *PULARGE_INTEGER; diff --git a/include/winternl.h b/include/winternl.h index d50bc730660..40d4ca4716a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -76,13 +76,8 @@ typedef const UNICODE_STRING *PCUNICODE_STRING; /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ typedef struct _FILETIME { -#ifdef WORDS_BIGENDIAN - DWORD dwHighDateTime; - DWORD dwLowDateTime; -#else DWORD dwLowDateTime; DWORD dwHighDateTime; -#endif } FILETIME, *PFILETIME, *LPFILETIME; #endif /* _FILETIME_ */ diff --git a/include/winuser.h b/include/winuser.h index 4ed29e86616..c0736502a2e 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1625,15 +1625,9 @@ typedef struct tagCURSORINFO /* this is the 6 byte accel struct used in Win32 when presented to the user */ typedef struct tagACCEL { -#ifdef WORDS_BIGENDIAN - WORD fVirt; - WORD key; - DWORD cmd; -#else BYTE fVirt; WORD key; WORD cmd; -#endif } ACCEL, *LPACCEL; diff --git a/include/wtypes.idl b/include/wtypes.idl index d08148dc840..77a9f1c761a 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -646,13 +646,8 @@ cpp_quote("#ifndef _tagCY_DEFINED") cpp_quote("#define _tagCY_DEFINED") cpp_quote("typedef union tagCY {") cpp_quote(" struct {") -cpp_quote("#ifdef WORDS_BIGENDIAN") -cpp_quote(" LONG Hi;") -cpp_quote(" ULONG Lo;") -cpp_quote("#else") cpp_quote(" ULONG Lo;") cpp_quote(" LONG Hi;") -cpp_quote("#endif") cpp_quote(" } DUMMYSTRUCTNAME;") cpp_quote(" LONGLONG int64;") cpp_quote("} CY;") @@ -682,13 +677,8 @@ cpp_quote(" } DUMMYUNIONNAME;") cpp_quote(" ULONG Hi32;") cpp_quote(" union {") cpp_quote(" struct {") -cpp_quote("#ifdef WORDS_BIGENDIAN") -cpp_quote(" ULONG Mid32;") -cpp_quote(" ULONG Lo32;") -cpp_quote("#else") cpp_quote(" ULONG Lo32;") cpp_quote(" ULONG Mid32;") -cpp_quote("#endif") cpp_quote(" } DUMMYSTRUCTNAME1;") cpp_quote(" ULONGLONG Lo64;") cpp_quote(" } DUMMYUNIONNAME1;")

1 0

Helix Graziani : winecfg: Change system theme alongside app theme.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

1 0

Alexandre Julliard : ws2_32: Make htonl/htons/ntohl/ntohs proper functions.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 6b4399e3694e27a703c5b7f7740dc6644a4fb5b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b4399e3694e27a703c5b7f7740dc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 11:05:28 2023 +0200 ws2_32: Make htonl/htons/ntohl/ntohs proper functions. --- dlls/inetmib1/Makefile.in | 2 +- dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/tests/Makefile.in | 2 +- dlls/ntdll/rtl.c | 3 +++ dlls/ntoskrnl.exe/tests/driver_netio.c | 15 +++++++---- dlls/ws2_32/protocol.c | 16 ++++++------ dlls/ws2_32/ws2_32.spec | 8 +++--- include/winsock.h | 46 +++------------------------------- include/winsock2.h | 44 +++----------------------------- libs/ldap/libldap/sasl_w.c | 1 + 10 files changed, 37 insertions(+), 102 deletions(-)

1 0

Helix Graziani : uxtheme: Add ShouldSystemUseDarkMode.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 91e54e5f6d33ff17ce6ab904fbdcdeb6497de8cb URL: https://gitlab.winehq.org/wine/wine/-/commit/91e54e5f6d33ff17ce6ab904fbdcde… Author: Helix Graziani <helix.graziani(a)hotmail.com> Date: Tue Sep 26 20:03:44 2023 -0400 uxtheme: Add ShouldSystemUseDarkMode. --- dlls/uxtheme/system.c | 17 +++++++++++++++++ dlls/uxtheme/tests/system.c | 33 +++++++++++++++++++++++++++++++++ dlls/uxtheme/uxtheme.spec | 1 + 3 files changed, 51 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 25f495d29f3..156051406e3 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1256,3 +1256,20 @@ BOOL WINAPI ThemeHooksRemove(void) UnregisterUserApiHook(); return TRUE; } + +/********************************************************************** + * ShouldSystemUseDarkMode (UXTHEME.138) + * + * RETURNS + * Whether or not the system should use dark mode. + */ +BOOL WINAPI ShouldSystemUseDarkMode(void) +{ + DWORD light_theme = TRUE, light_theme_size = sizeof(light_theme); + + RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", + L"SystemUsesLightTheme", RRF_RT_REG_DWORD, NULL, &light_theme, &light_theme_size); + + return !light_theme; +} diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 2e769625dab..390baece969 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -48,6 +48,7 @@ static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, DWORD *); +static BOOL (WINAPI *pShouldSystemUseDarkMode)(void); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -74,6 +75,8 @@ static void init_funcs(void) HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); HMODULE uxtheme = GetModuleHandleA("uxtheme.dll"); + pShouldSystemUseDarkMode = (void *)GetProcAddress(uxtheme, MAKEINTRESOURCEA(138)); + #define GET_PROC(module, func) \ p##func = (void *)GetProcAddress(module, #func); \ if (!p##func) \ @@ -2597,6 +2600,35 @@ static void test_theme(void) DestroyWindow(hwnd); } +static void test_ShouldSystemUseDarkMode(void) +{ + DWORD light_theme, light_theme_size = sizeof(light_theme), last_error; + BOOL result; + LSTATUS ls; + + if (!pShouldSystemUseDarkMode) + { + win_skip("ShouldSystemUseDarkMode() is unavailable.\n"); + return; + } + + ls = RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", + L"SystemUsesLightTheme", RRF_RT_REG_DWORD, NULL, &light_theme, &light_theme_size); + if (ls == ERROR_FILE_NOT_FOUND) + { + light_theme = 1; + ls = 0; + } + ok(ls == 0, "RegGetValue failed: %ld.\n", ls); + + SetLastError(0xdeadbeef); + result = pShouldSystemUseDarkMode(); + last_error = GetLastError(); + ok(last_error == 0xdeadbeef, "ShouldSystemUseDarkMode set last error: %ld.\n", last_error); + ok(result == !light_theme, "Expected value %d, got %d.\n", !light_theme, result); +} + START_TEST(system) { ULONG_PTR ctx_cookie; @@ -2622,6 +2654,7 @@ START_TEST(system) test_DrawThemeBackgroundEx(); test_GetThemeBackgroundRegion(); test_theme(); + test_ShouldSystemUseDarkMode(); if (load_v6_module(&ctx_cookie, &ctx)) { diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index c60254b677d..a5bfb88c49a 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -42,6 +42,7 @@ 61 stdcall OpenThemeDataEx(ptr wstr long) 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection +138 stdcall -noname ShouldSystemUseDarkMode() # Standard functions @ stdcall BeginBufferedAnimation(ptr ptr ptr long ptr ptr ptr ptr)

1 0

Marcus Meissner : user32/tests: Use correct size to LoadStringW.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 9d7c813b5e8ae3fe543475a55a20a60fcca869f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d7c813b5e8ae3fe543475a55a20a6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 10 09:55:54 2023 +0200 user32/tests: Use correct size to LoadStringW. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/user32/tests/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 73f2b46261a..2369aef2a09 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -112,7 +112,7 @@ static void test_LoadStringW(void) { winetest_push_context("Test %u", i); - length1 = LoadStringW(hInst, string_table_tests[i].id, returnedstringw, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, string_table_tests[i].id, returnedstringw, ARRAY_SIZE(returnedstringw)); ok(length1 == wcslen(string_table_tests[i].string), "Got wrong length %d.\n", length1); ok(!wcscmp(returnedstringw, string_table_tests[i].string), "Got wrong string %s.\n", debugstr_w(returnedstringw));

1 0

Rémi Bernon : dmsynth: Create and register a fluid_sfont instance.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: 907c67ce3cfef4a2b69315c226d3995831f0c5c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/907c67ce3cfef4a2b69315c226d399… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 11:40:01 2023 +0200 dmsynth: Create and register a fluid_sfont instance. --- dlls/dmsynth/synth.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 48aa175698d..945889efb6f 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_sfont_t *fluid_sfont; fluid_synth_t *fluid_synth; }; @@ -304,6 +305,9 @@ static ULONG WINAPI synth_Release(IDirectMusicSynth8 *iface) wave_release(wave); } + fluid_sfont_set_data(This->fluid_sfont, NULL); + delete_fluid_sfont(This->fluid_sfont); + This->fluid_sfont = NULL; delete_fluid_settings(This->fluid_settings); free(This); } @@ -328,6 +332,7 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par }; UINT size = sizeof(DMUS_PORTPARAMS); BOOL modified = FALSE; + UINT id; TRACE("(%p, %p)\n", This, params); @@ -388,6 +393,8 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par fluid_settings_setnum(This->fluid_settings, "synth.sample-rate", actual.dwSampleRate); if (!(This->fluid_synth = new_fluid_synth(This->fluid_settings))) return E_OUTOFMEMORY; + if ((id = fluid_synth_add_sfont(This->fluid_synth, This->fluid_sfont)) == FLUID_FAILED) + WARN("Failed to add fluid_sfont to fluid_synth\n"); This->params = actual; This->open = TRUE; @@ -404,6 +411,7 @@ static HRESULT WINAPI synth_Close(IDirectMusicSynth8 *iface) if (!This->open) return DMUS_E_ALREADYCLOSED; + fluid_synth_remove_sfont(This->fluid_synth, This->fluid_sfont); delete_fluid_synth(This->fluid_synth); This->fluid_synth = NULL; This->open = FALSE; @@ -1063,6 +1071,44 @@ static const IKsControlVtbl synth_control_vtbl = synth_control_KsEvent, }; +static const char *synth_sfont_get_name(fluid_sfont_t *fluid_sfont) +{ + return "DirectMusicSynth"; +} + +static fluid_preset_t *synth_sfont_get_preset(fluid_sfont_t *fluid_sfont, int bank, int patch) +{ + struct synth *synth = fluid_sfont_get_data(fluid_sfont); + struct instrument *instrument; + + TRACE("(%p, %d, %d)\n", fluid_sfont, bank, patch); + + if (!synth) return NULL; + + LIST_FOR_EACH_ENTRY(instrument, &synth->instruments, struct instrument, entry) + if (instrument->patch == patch) break; + if (&instrument->entry == &synth->instruments) return NULL; + + FIXME("Preset not implemented yet\n"); + return NULL; +} + +static void synth_sfont_iter_start(fluid_sfont_t *fluid_sfont) +{ + FIXME("(%p): stub\n", fluid_sfont); +} + +static fluid_preset_t *synth_sfont_iter_next(fluid_sfont_t *fluid_sfont) +{ + FIXME("(%p): stub\n", fluid_sfont); + return NULL; +} + +static int synth_sfont_free(fluid_sfont_t *fluid_sfont) +{ + return 0; +} + HRESULT synth_create(IUnknown **ret_iface) { struct synth *obj; @@ -1091,12 +1137,17 @@ HRESULT synth_create(IUnknown **ret_iface) list_init(&obj->waves); if (!(obj->fluid_settings = new_fluid_settings())) goto failed; + if (!(obj->fluid_sfont = new_fluid_sfont(synth_sfont_get_name, synth_sfont_get_preset, + synth_sfont_iter_start, synth_sfont_iter_next, synth_sfont_free))) + goto failed; + fluid_sfont_set_data(obj->fluid_sfont, obj); TRACE("Created DirectMusicSynth %p\n", obj); *ret_iface = (IUnknown *)&obj->IDirectMusicSynth8_iface; return S_OK; failed: + delete_fluid_settings(obj->fluid_settings); free(obj); return E_OUTOFMEMORY; }

1 0

Rémi Bernon : dmsynth: Simplify IDirectMusicSynth8_Open checks.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: wine Branch: master Commit: fcc8a1be68d414ae037d555f77bb80de2d10a6b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcc8a1be68d414ae037d555f77bb80… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 8 09:10:04 2023 +0200 dmsynth: Simplify IDirectMusicSynth8_Open checks. --- dlls/dmsynth/synth.c | 126 ++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 66 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 780ea999ce6..505f1387b41 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -313,85 +313,79 @@ static ULONG WINAPI synth_Release(IDirectMusicSynth8 *iface) static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *params) { struct synth *This = impl_from_IDirectMusicSynth8(iface); - BOOL modified = FALSE; - const DMUS_PORTPARAMS def = { - .dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS| - DMUS_PORTPARAMS_AUDIOCHANNELS|DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS| - DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES, - .dwSize = sizeof(def), .dwVoices = 32, .dwChannelGroups = 2, .dwAudioChannels = 2, - .dwSampleRate = 22050, .dwEffectFlags = DMUS_EFFECT_REVERB + DMUS_PORTPARAMS actual = + { + .dwSize = sizeof(DMUS_PORTPARAMS), + .dwValidParams = DMUS_PORTPARAMS_VOICES | DMUS_PORTPARAMS_CHANNELGROUPS + | DMUS_PORTPARAMS_AUDIOCHANNELS | DMUS_PORTPARAMS_SAMPLERATE + | DMUS_PORTPARAMS_EFFECTS | DMUS_PORTPARAMS_SHARE | DMUS_PORTPARAMS_FEATURES, + .dwVoices = 32, + .dwChannelGroups = 2, + .dwAudioChannels = 2, + .dwSampleRate = 22050, + .dwEffectFlags = DMUS_EFFECT_REVERB, }; + UINT size = sizeof(DMUS_PORTPARAMS); + BOOL modified = FALSE; TRACE("(%p, %p)\n", This, params); - if (This->open) - return DMUS_E_ALREADYOPEN; - if (params && params->dwSize < sizeof(DMUS_PORTPARAMS7)) - return E_INVALIDARG; + if (This->open) return DMUS_E_ALREADYOPEN; - This->open = TRUE; + if (params) + { + if (params->dwSize < sizeof(DMUS_PORTPARAMS7)) return E_INVALIDARG; + if (size > params->dwSize) size = params->dwSize; - if (!params) { - memcpy(&This->params, &def, sizeof(This->params)); - return S_OK; - } + if ((params->dwValidParams & DMUS_PORTPARAMS_VOICES) && params->dwVoices) + { + actual.dwVoices = min(params->dwVoices, This->caps.dwMaxVoices); + modified |= actual.dwVoices != params->dwVoices; + } - if (params->dwValidParams & DMUS_PORTPARAMS_VOICES && params->dwVoices) { - if (params->dwVoices > This->caps.dwMaxVoices) { - modified = TRUE; - params->dwVoices = This->caps.dwMaxVoices; + if ((params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) && params->dwChannelGroups) + { + actual.dwChannelGroups = min(params->dwChannelGroups, This->caps.dwMaxChannelGroups); + modified |= actual.dwChannelGroups != params->dwChannelGroups; } - } else - params->dwVoices = def.dwVoices; - if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS && params->dwChannelGroups) { - if (params->dwChannelGroups > This->caps.dwMaxChannelGroups) { - modified = TRUE; - params->dwChannelGroups = This->caps.dwMaxChannelGroups; + if ((params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS) && params->dwAudioChannels) + { + actual.dwAudioChannels = min(params->dwAudioChannels, This->caps.dwMaxAudioChannels); + modified |= actual.dwAudioChannels != params->dwAudioChannels; } - } else - params->dwChannelGroups = def.dwChannelGroups; - if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS && params->dwAudioChannels) { - if (params->dwAudioChannels > This->caps.dwMaxAudioChannels) { - modified = TRUE; - params->dwAudioChannels = This->caps.dwMaxAudioChannels; + if ((params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE) && params->dwSampleRate) + { + actual.dwSampleRate = min(max(params->dwSampleRate, 11025), 96000); + modified |= actual.dwSampleRate != params->dwSampleRate; } - } else - params->dwAudioChannels = def.dwAudioChannels; - - if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE && params->dwSampleRate) { - if (params->dwSampleRate > 96000) { - modified = TRUE; - params->dwSampleRate = 96000; - } else if (params->dwSampleRate < 11025) { - modified = TRUE; - params->dwSampleRate = 11025; + + if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS) + { + actual.dwEffectFlags = DMUS_EFFECT_REVERB; + modified |= actual.dwEffectFlags != params->dwEffectFlags; + } + + if (params->dwValidParams & DMUS_PORTPARAMS_SHARE) + { + actual.fShare = FALSE; + modified |= actual.fShare != params->fShare; + } + + if (params->dwSize < sizeof(*params)) + actual.dwValidParams &= ~DMUS_PORTPARAMS_FEATURES; + else if ((params->dwValidParams & DMUS_PORTPARAMS_FEATURES) && params->dwFeatures) + { + actual.dwFeatures = params->dwFeatures & (DMUS_PORT_FEATURE_AUDIOPATH | DMUS_PORT_FEATURE_STREAMING); + modified |= actual.dwFeatures != params->dwFeatures; } - } else - params->dwSampleRate = def.dwSampleRate; - - if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS && params->dwEffectFlags != def.dwEffectFlags) - modified = TRUE; - params->dwEffectFlags = def.dwEffectFlags; - - if (params->dwValidParams & DMUS_PORTPARAMS_SHARE && params->fShare) - modified = TRUE; - params->fShare = FALSE; - - if (params->dwSize >= sizeof(*params)) { - if (params->dwValidParams & DMUS_PORTPARAMS_FEATURES && params->dwFeatures) { - if (params->dwFeatures & ~(DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING)) { - modified = TRUE; - params->dwFeatures &= DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; - } - } else - params->dwFeatures = def.dwFeatures; - params->dwValidParams = def.dwValidParams; - } else - params->dwValidParams = def.dwValidParams & ~DMUS_PORTPARAMS_FEATURES; - - memcpy(&This->params, params, min(params->dwSize, sizeof(This->params))); + + memcpy(params, &actual, size); + } + + This->params = actual; + This->open = TRUE; return modified ? S_FALSE : S_OK; }

1 0

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