November 2019 - Wine-commits

Alexandre Julliard : ntdll: Fix counting of environment strings.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 599deed91cc6a91fa83072ac21d8516a4647e174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=599deed91cc6a91fa83072ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 20 16:24:49 2019 +0100 ntdll: Fix counting of environment strings. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48141 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 6c7ca1e499..79a1805618 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -526,7 +526,7 @@ char **build_envp( const WCHAR *envW ) if (!(env = RtlAllocateHeap( GetProcessHeap(), 0, length ))) return NULL; ntdll_wcstoumbs( 0, envW, lenW, env, length, NULL, NULL ); - for (p = env; *p; p += strlen(p) + 1) + for (p = env; *p; p += strlen(p) + 1, count++) if (is_special_env_var( p )) length += 4; /* prefix it with "WINE" */ for (i = 0; i < ARRAY_SIZE( unix_vars ); i++)

1 0

Alexandre Julliard : ntdll: Initialize the system and user locales directly in ntdll.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: f1bfd2c0b11844b9d50905d5c424c71473f281da URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1bfd2c0b11844b9d50905d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 20 09:56:25 2019 +0100 ntdll: Initialize the system and user locales directly in ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 4 -- dlls/ntdll/locale.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b2a5831a9e..4126589220 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3555,10 +3555,6 @@ void LOCALE_Init(void) setup_unix_locales(); if (!lcid_LC_MESSAGES) lcid_LC_MESSAGES = lcid_LC_CTYPE; - NtSetDefaultUILanguage( LANGIDFROMLCID(lcid_LC_MESSAGES) ); - NtSetDefaultLocale( TRUE, lcid_LC_MESSAGES ); - NtSetDefaultLocale( FALSE, lcid_LC_CTYPE ); - ansi_cp = get_lcid_codepage( LOCALE_USER_DEFAULT ); GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IDEFAULTMACCODEPAGE | LOCALE_RETURN_NUMBER, (LPWSTR)&mac_cp, sizeof(mac_cp)/sizeof(WCHAR) ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 73f72b1986..27e38d6e40 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -27,6 +27,11 @@ #include <string.h> #include <stdlib.h> +#ifdef __APPLE__ +# include <CoreFoundation/CFLocale.h> +# include <CoreFoundation/CFString.h> +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #include "ntdll_misc.h" @@ -165,10 +170,167 @@ void init_unix_codepage(void) { } #endif /* __APPLE__ || __ANDROID__ */ +/* Unix format is: lang[_country][.charset][@modifier] + * Windows format is: lang[-script][-country][_modifier] */ +static LCID unix_locale_to_lcid( const char *unix_name ) +{ + static const WCHAR sepW[] = {'_','.','@',0}; + static const WCHAR posixW[] = {'P','O','S','I','X',0}; + static const WCHAR cW[] = {'C',0}; + static const WCHAR euroW[] = {'e','u','r','o',0}; + static const WCHAR latinW[] = {'l','a','t','i','n',0}; + static const WCHAR latnW[] = {'-','L','a','t','n',0}; + WCHAR buffer[LOCALE_NAME_MAX_LENGTH], win_name[LOCALE_NAME_MAX_LENGTH]; + WCHAR *p, *country = NULL, *modifier = NULL; + LCID lcid; + + if (!unix_name || !unix_name[0] || !strcmp( unix_name, "C" )) + { + unix_name = getenv( "LC_ALL" ); + if (!unix_name || !unix_name[0]) return 0; + } + + if (ntdll_umbstowcs( 0, unix_name, strlen(unix_name) + 1, buffer, ARRAY_SIZE(buffer) ) < 0) return 0; + + if (!(p = strpbrkW( buffer, sepW ))) + { + if (!strcmpW( buffer, posixW ) || !strcmpW( buffer, cW )) + return MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); + strcpyW( win_name, buffer ); + } + else + { + if (*p == '_') + { + *p++ = 0; + country = p; + p = strpbrkW( p, sepW + 1 ); + } + if (p && *p == '.') + { + *p++ = 0; + /* charset, ignore */ + p = strchrW( p, '@' ); + } + if (p) + { + *p++ = 0; + modifier = p; + } + } + + /* rebuild a Windows name */ + + strcpyW( win_name, buffer ); + if (modifier) + { + if (!strcmpW( modifier, latinW )) strcatW( win_name, latnW ); + else if (!strcmpW( modifier, euroW )) {} /* ignore */ + else return 0; + } + if (country) + { + p = win_name + strlenW(win_name); + *p++ = '-'; + strcpyW( p, country ); + } + + if (!RtlLocaleNameToLcid( win_name, &lcid, 0 )) return lcid; + + /* try neutral name */ + if (country) + { + p[-1] = 0; + if (!RtlLocaleNameToLcid( win_name, &lcid, 2 )) + { + if (SUBLANGID(lcid) == SUBLANG_NEUTRAL) + lcid = MAKELANGID( PRIMARYLANGID(lcid), SUBLANG_DEFAULT ); + return lcid; + } + } + return 0; +} + +/****************************************************************** + * init_locale + */ void init_locale( HMODULE module ) { + LCID system_lcid, user_lcid; + kernel32_handle = module; + + setlocale( LC_ALL, "" ); + + system_lcid = unix_locale_to_lcid( setlocale( LC_CTYPE, NULL )); + user_lcid = unix_locale_to_lcid( setlocale( LC_MESSAGES, NULL )); + +#ifdef __APPLE__ + if (!system_lcid) + { + char buffer[LOCALE_NAME_MAX_LENGTH]; + + CFLocaleRef locale = CFLocaleCopyCurrent(); + CFStringRef lang = CFLocaleGetValue( locale, kCFLocaleLanguageCode ); + CFStringRef country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); + CFStringRef locale_string; + + if (country) + locale_string = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@_%@"), lang, country); + else + locale_string = CFStringCreateCopy(NULL, lang); + + CFStringGetCString(locale_string, buffer, sizeof(buffer), kCFStringEncodingUTF8); + system_lcid = unix_locale_to_lcid( buffer ); + CFRelease(locale); + CFRelease(locale_string); + } + if (!user_lcid) + { + /* Retrieve the preferred language as chosen in System Preferences. */ + char buffer[LOCALE_NAME_MAX_LENGTH]; + CFArrayRef preferred_langs = CFLocaleCopyPreferredLanguages(); + if (preferred_langs && CFArrayGetCount( preferred_langs )) + { + CFStringRef preferred_lang = CFArrayGetValueAtIndex( preferred_langs, 0 ); + CFDictionaryRef components = CFLocaleCreateComponentsFromLocaleIdentifier( NULL, preferred_lang ); + if (components) + { + CFStringRef lang = CFDictionaryGetValue( components, kCFLocaleLanguageCode ); + CFStringRef country = CFDictionaryGetValue( components, kCFLocaleCountryCode ); + CFLocaleRef locale = NULL; + CFStringRef locale_string; + + if (!country) + { + locale = CFLocaleCopyCurrent(); + country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); + } + if (country) + locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@_%@"), lang, country ); + else + locale_string = CFStringCreateCopy( NULL, lang ); + CFStringGetCString( locale_string, buffer, sizeof(buffer), kCFStringEncodingUTF8 ); + CFRelease( locale_string ); + if (locale) CFRelease( locale ); + CFRelease( components ); + user_lcid = unix_locale_to_lcid( buffer ); + } + } + if (preferred_langs) CFRelease( preferred_langs ); + } +#endif + + if (!system_lcid) system_lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); + if (!user_lcid) user_lcid = system_lcid; + + NtSetDefaultUILanguage( LANGIDFROMLCID(user_lcid) ); + NtSetDefaultLocale( TRUE, user_lcid ); + NtSetDefaultLocale( FALSE, system_lcid ); + TRACE( "system=%04x user=%04x\n", system_lcid, user_lcid ); + + setlocale( LC_NUMERIC, "C" ); /* FIXME: oleaut32 depends on this */ }

1 0

Vijay Kiran Kamuju : comdlg32: Use the new colordlg.h file and update the resources.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: a9c4b309f6af82b624604bd0df898ad88d59ab5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c4b309f6af82b624604bd0… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Nov 16 11:35:26 2019 +0100 comdlg32: Use the new colordlg.h file and update the resources. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/cdlg.h | 22 --- dlls/comdlg32/colordlg.c | 138 ++++++++-------- dlls/comdlg32/comdlg32.rc | 46 +++--- po/ar.po | 403 +++++++++++++++++++++++----------------------- po/ast.po | 401 +++++++++++++++++++++++---------------------- po/bg.po | 403 +++++++++++++++++++++++----------------------- po/ca.po | 403 +++++++++++++++++++++++----------------------- po/cs.po | 403 +++++++++++++++++++++++----------------------- po/da.po | 403 +++++++++++++++++++++++----------------------- po/de.po | 403 +++++++++++++++++++++++----------------------- po/el.po | 402 ++++++++++++++++++++++----------------------- po/en.po | 401 ++++++++++++++++++++++----------------------- po/en_US.po | 401 ++++++++++++++++++++++----------------------- po/eo.po | 403 +++++++++++++++++++++++----------------------- po/es.po | 403 +++++++++++++++++++++++----------------------- po/fa.po | 399 +++++++++++++++++++++++---------------------- po/fi.po | 403 +++++++++++++++++++++++----------------------- po/fr.po | 403 +++++++++++++++++++++++----------------------- po/he.po | 403 +++++++++++++++++++++++----------------------- po/hi.po | 399 +++++++++++++++++++++++---------------------- po/hr.po | 403 +++++++++++++++++++++++----------------------- po/hu.po | 403 +++++++++++++++++++++++----------------------- po/it.po | 403 +++++++++++++++++++++++----------------------- po/ja.po | 403 +++++++++++++++++++++++----------------------- po/ko.po | 403 +++++++++++++++++++++++----------------------- po/lt.po | 403 +++++++++++++++++++++++----------------------- po/ml.po | 399 +++++++++++++++++++++++---------------------- po/nb_NO.po | 403 +++++++++++++++++++++++----------------------- po/nl.po | 403 +++++++++++++++++++++++----------------------- po/or.po | 399 +++++++++++++++++++++++---------------------- po/pa.po | 399 +++++++++++++++++++++++---------------------- po/pl.po | 403 +++++++++++++++++++++++----------------------- po/pt_BR.po | 403 +++++++++++++++++++++++----------------------- po/pt_PT.po | 403 +++++++++++++++++++++++----------------------- po/rm.po | 399 +++++++++++++++++++++++---------------------- po/ro.po | 403 +++++++++++++++++++++++----------------------- po/ru.po | 403 +++++++++++++++++++++++----------------------- po/si.po | 403 +++++++++++++++++++++++----------------------- po/sk.po | 403 +++++++++++++++++++++++----------------------- po/sl.po | 403 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 403 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 401 +++++++++++++++++++++++---------------------- po/sv.po | 403 +++++++++++++++++++++++----------------------- po/ta.po | 401 +++++++++++++++++++++++---------------------- po/te.po | 399 +++++++++++++++++++++++---------------------- po/th.po | 402 ++++++++++++++++++++++----------------------- po/tr.po | 403 +++++++++++++++++++++++----------------------- po/uk.po | 403 +++++++++++++++++++++++----------------------- po/wa.po | 403 +++++++++++++++++++++++----------------------- po/wine.pot | 399 +++++++++++++++++++++++---------------------- po/zh_CN.po | 403 +++++++++++++++++++++++----------------------- po/zh_TW.po | 403 +++++++++++++++++++++++----------------------- 52 files changed, 10106 insertions(+), 9803 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9c4b309f6af82b62460…

1 0

João Diogo Ferreira : kernel32: Handle GEOCLASS_ALL in EnumSystemGeoID().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 2a03c0958b1d15e7684b9437e67bf327098bcfde URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a03c0958b1d15e7684b9437… Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Mon Nov 18 02:27:24 2019 +0000 kernel32: Handle GEOCLASS_ALL in EnumSystemGeoID(). Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 25 +++++++++++++++++++------ dlls/kernel32/tests/locale.c | 13 +++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e5e32d3cb5..b2a5831a9e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4247,16 +4247,28 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L /****************************************************************************** * EnumSystemGeoID (KERNEL32.@) * - * Call a users function for every location available on the system. + * Calls a user's function for every location available on the system. * * PARAMS - * geoclass [I] Type of information desired (SYSGEOTYPE enum from "winnls.h") - * parent [I] GEOID for the parent - * enumproc [I] Callback function to call for each location + * geoclass [I] Type of location desired (SYSGEOTYPE enum from "winnls.h") + * parent [I] GeoID for the parent + * enumproc [I] Callback function to call for each location (prototype in "winnls.h") * * RETURNS * Success: TRUE. * Failure: FALSE. Use GetLastError() to determine the cause. + * + * NOTES + * The enumproc function returns TRUE to continue enumerating + * or FALSE to interrupt the enumeration. + * + * On failure, GetLastError() returns one of the following values: + * - ERROR_INVALID_PARAMETER: no callback function was provided. + * - ERROR_INVALID_FLAGS: the location type was invalid. + * + * TODO + * On Windows 10, this function filters out those locations which + * simultaneously lack ISO and UN codes (e.g. Johnson Atoll). */ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumproc) { @@ -4269,7 +4281,7 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr return FALSE; } - if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION) { + if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION && geoclass != GEOCLASS_ALL) { SetLastError(ERROR_INVALID_FLAGS); return FALSE; } @@ -4277,9 +4289,10 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) { const struct geoinfo_t *ptr = &geoinfodata[i]; - if (geoclass == GEOCLASS_NATION && (ptr->kind == LOCATION_REGION)) + if (geoclass == GEOCLASS_NATION && (ptr->kind != LOCATION_NATION)) continue; + /* LOCATION_BOTH counts as region. */ if (geoclass == GEOCLASS_REGION && (ptr->kind == LOCATION_NATION)) continue; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index aaaf09cf5c..45cb11d254 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4981,6 +4981,19 @@ static void test_EnumSystemGeoID(void) ret = pEnumSystemGeoID(GEOCLASS_REGION, 0, test_geoid_enumproc2); ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); } + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 39070, test_geoid_enumproc2); + if (ret == 0) + win_skip("GEOCLASS_ALL is not supported in EnumSystemGeoID.\n"); + else + { + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 0, test_geoid_enumproc2); + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + } } struct invariant_entry {

1 0

Alistair Leslie-Hughes : dmime: Rewrite IDirectMusicSegment8 GetParam.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: cec8d5c968ed6c5708f7d94192bf93f631e13781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec8d5c968ed6c5708f7d941… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 19 21:02:49 2019 +0100 dmime: Rewrite IDirectMusicSegment8 GetParam. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 78 +++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index d47c2f2c23..3c0d4ac567 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -366,58 +366,50 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus } static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, - REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, - void *pParam) + REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, + void *param) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - CLSID pIt_clsid; - struct list* pEntry = NULL; - IDirectMusicTrack* pTrack = NULL; - IPersistStream* pCLSIDStream = NULL; - LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; - HRESULT hr = S_OK; + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + struct list *item; + IDirectMusicTrack *track; + DMUS_PRIVATE_SEGMENT_TRACK *segment; + HRESULT hr; - FIXME("(%p, %s, 0x%x, %d, %d, %p, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); - - if (DMUS_SEG_ANYTRACK == dwIndex) { - - LIST_FOR_EACH (pEntry, &This->Tracks) { - pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); + FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group, + index, time, next, param); - hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); - if (FAILED(hr)) { - ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack); - continue ; - } + if (index == DMUS_SEG_ANYTRACK || group == 0xffffffff) { + if (group == 0xffffffff && index != DMUS_SEG_ANYTRACK) + WARN("Any group doesnt have DMUS_SEG_ANYTRACK index.\n"); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + LIST_FOR_EACH (item, &This->Tracks) { + segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry); - if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; - hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid); - IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL; - if (FAILED(hr)) { - ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack); - continue ; - } - if (FALSE == IsEqualGUID(&pIt_clsid, rguidType)) continue ; - if (FAILED(IDirectMusicTrack_IsParamSupported(pIt->pTrack, rguidType))) continue ; - hr = IDirectMusicTrack_GetParam(pIt->pTrack, rguidType, mtTime, pmtNext, pParam); - if (SUCCEEDED(hr)) return hr; + TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack); + + if (group != 0xffffffff && !(segment->dwGroupBits & group)) + continue; + if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type))) + continue; + hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param); + if (SUCCEEDED(hr)) + return hr; + } + + WARN("(%p): not found\n", This); + return DMUS_E_TRACK_NOT_FOUND; } - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } - hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, dwGroupBits, dwIndex, &pTrack); - if (FAILED(hr)) { - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } + hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track); + if (FAILED(hr)) { + ERR("(%p): not found\n", This); + return DMUS_E_TRACK_NOT_FOUND; + } - hr = IDirectMusicTrack_GetParam(pTrack, rguidType, mtTime, pmtNext, pParam); - IDirectMusicTrack_Release(pTrack); pTrack = NULL; + hr = IDirectMusicTrack_GetParam(track, type, time, next, param); + IDirectMusicTrack_Release(track); - return hr; + return hr; } static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *iface,

1 0

Michael Stefaniuc : dmstyle: The Chord track doesn't support the BandParam type.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: f5ad835ec3bcfbce2039a994577f2dd27fc48957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ad835ec3bcfbce2039a994… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:51 2019 +0100 dmstyle: The Chord track doesn't support the BandParam type. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/chordtrack.c | 25 +++++++++++-------------- dlls/dmstyle/tests/dmstyle.c | 9 ++++----- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index cb690b04dc..09d0bf3c9f 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -140,23 +140,20 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rg return S_OK; } -static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - if (!rguidType) - return E_POINTER; + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); - if (IsEqualGUID (rguidType, &GUID_BandParam) - || IsEqualGUID (rguidType, &GUID_ChordParam) - || IsEqualGUID (rguidType, &GUID_RhythmParam)) { - TRACE("param supported\n"); - return S_OK; - } - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + if (!type) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_ChordParam) || IsEqualGUID(type, &GUID_RhythmParam)) + return S_OK; + + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI chord_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 0c17ef3b41..6419f6f810 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -291,7 +291,7 @@ static void test_track(void) unsigned int todo_params; } class[] = { { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, - { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 }, { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, @@ -333,10 +333,9 @@ static void test_track(void) ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", param_types[j].name, hr); else - todo_wine_if(class[i].todo_params & (1 << j)) - ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", - param_types[j].name, hr); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); } if (class[i].clsid == &CLSID_DirectMusicMuteTrack) {

1 0

Michael Stefaniuc : dmcompos/tests: Check all IDirectMusicTrack_IsParamSupported() types.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: bcab0696e01fff9a7dd8de1627dc117d1af3c360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcab0696e01fff9a7dd8de16… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:50 2019 +0100 dmcompos/tests: Check all IDirectMusicTrack_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index d23f5d6dae..e5cb7da8ad 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -270,6 +270,42 @@ static void test_chordmaptrack(void) CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } unsupported[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) }, + }; +#undef X + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicChordMapTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); @@ -290,8 +326,18 @@ static void test_chordmaptrack(void) hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); + ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + unsupported[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);

1 0

Alistair Leslie-Hughes : dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: de11d172dc701740fb58fc9510eb344b23210f20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de11d172dc701740fb58fc95… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 18 03:07:53 2019 +0000 dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/styletrack.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index cc15bd81d1..06fe1c7ca8 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -132,15 +132,31 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + struct list *item = NULL; - if (!rguidType) + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; + if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) { + LIST_FOR_EACH (item, &This->Items) { + DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry); + if (style->pObject) { + IDirectMusicStyle8_AddRef(style->pObject); + *((IDirectMusicStyle8**)param) = style->pObject; + + return S_OK; + } + } + + return DMUS_E_NOT_FOUND; + } + return S_OK; }

1 0

Michael Stefaniuc : dmstyle: Implement IsParamSupported() for the Audition track.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 274427aa6ac8cd298532328a7b773c4fc372ddf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=274427aa6ac8cd298532328a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:52 2019 +0100 dmstyle: Implement IsParamSupported() for the Audition track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/auditiontrack.c | 28 ++++++++++++++++++++-------- dlls/dmstyle/tests/dmstyle.c | 20 +++++++++----------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 7555da0c6c..9d45f1bcd0 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -137,18 +137,30 @@ static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID return S_OK; } -static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + static const GUID *valid[] = { + &GUID_DisableTimeSig, + &GUID_EnableTimeSig, + &GUID_SeedVariations, + &GUID_Valid_Start_Time, + &GUID_Variations + }; + unsigned int i; + - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); + + if (!type) + return E_POINTER; - if (!rguidType) - return E_POINTER; + for (i = 0; i < ARRAY_SIZE(valid); i++) + if (IsEqualGUID(type, valid[i])) + return S_OK; - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI audition_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 6419f6f810..a63d1dbd1c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -286,16 +286,15 @@ static void test_track(void) const char *name; BOOL has_save; BOOL has_join; - /* bitfields with supported param types */ + /* bitfield with supported param types */ unsigned int has_params; - unsigned int todo_params; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, - { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 }, - { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, - { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, - { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, - { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200, 0 }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002 }, + { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38 }, + { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200 }, + { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000 }, + { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200 }, }; #undef X unsigned int i, j; @@ -329,9 +328,8 @@ static void test_track(void) for (j = 0; j < ARRAY_SIZE(param_types); j++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type); if (class[i].has_params & (1 << j)) - todo_wine_if(class[i].todo_params & (1 << j)) - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", - param_types[j].name, hr); + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); else ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",

1 0

Alexandre Julliard : dmime: Fix duplicate const.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 51bd1da2ab3724c84b94895bc54612da454dc059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51bd1da2ab3724c84b94895b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 22:37:23 2019 +0100 dmime: Fix duplicate const. --- dlls/dmime/wavetrack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 5869c9e72d..34adca6065 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -139,7 +139,7 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rgu static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - static const REFGUID valid[] = { + static const GUID *valid[] = { &GUID_Disable_Auto_Download, &GUID_Download, &GUID_DownloadToAudioPath,

1 0