April 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : kernelbase: Fix IsValidLocale() and GetLocaleInfo() with special LOCALE_* identifiers.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 812ebc67a4bf2830ee96eeb5c40e26eefb457500 URL: https://source.winehq.org/git/wine.git/?a=commit;h=812ebc67a4bf2830ee96eeb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 7 11:13:06 2022 +0200 kernelbase: Fix IsValidLocale() and GetLocaleInfo() with special LOCALE_* identifiers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 2 ++ dlls/kernel32/tests/locale.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/locale.c | 16 ++++++++++++---- dlls/msvcrt/locale.c | 2 ++ 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index e029f328544..7f112767880 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1108,6 +1108,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue), lpFormat, lpNumberStr, cchOut); + lcid = ConvertDefaultLocale(lcid); if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpNumberStr) || !IsValidLocale(lcid, 0) || (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep))) @@ -1498,6 +1499,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue), lpFormat, lpCurrencyStr, cchOut); + lcid = ConvertDefaultLocale(lcid); if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || !IsValidLocale(lcid, 0) || (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep || diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3b43dea2a2b..31cfb465798 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -266,6 +266,20 @@ static void test_GetLocaleInfoA(void) "got %d with '%s' (expected %d with '%s')\n", ret, buffer, len, expected); + len = GetLocaleInfoA(GetUserDefaultLCID(), LOCALE_SLANGUAGE, expected, ARRAY_SIZE(expected)); + ret = GetLocaleInfoA(LOCALE_NEUTRAL, LOCALE_SLANGUAGE, buffer, ARRAY_SIZE(buffer)); + ok( (ret == len) && !lstrcmpA(buffer, expected), "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + ret = GetLocaleInfoA(LOCALE_CUSTOM_DEFAULT, LOCALE_SLANGUAGE, buffer, ARRAY_SIZE(buffer)); + ok( (ret == len) && !lstrcmpA(buffer, expected), "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + ret = GetLocaleInfoA(LOCALE_CUSTOM_UNSPECIFIED, LOCALE_SLANGUAGE, buffer, ARRAY_SIZE(buffer)); + ok( (ret == len && !lstrcmpA(buffer, expected)) || broken(!ret), /* <= win8 */ + "got %d with '%s' (expected %d with '%s')\n", ret, buffer, len, expected); + len = GetLocaleInfoA(GetUserDefaultUILanguage(), LOCALE_SLANGUAGE, expected, ARRAY_SIZE(expected)); + ret = GetLocaleInfoA(LOCALE_CUSTOM_UI_DEFAULT, LOCALE_SLANGUAGE, buffer, ARRAY_SIZE(buffer)); + if (ret) ok( (ret == len && !lstrcmpA(buffer, expected)), + "got %d with '%s' (expected %d with '%s')\n", ret, buffer, len, expected); /* HTMLKit and "Font xplorer lite" expect GetLocaleInfoA to * partially fill the buffer even if it is too short. See bug 637. @@ -2675,6 +2689,7 @@ static void test_LocaleNameToLCID(void) NTSTATUS status; INT ret; WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; + WCHAR expbuff[LOCALE_NAME_MAX_LENGTH]; const struct neutralsublang_name_t *ptr; if (!pLocaleNameToLCID) @@ -2710,6 +2725,25 @@ static void test_LocaleNameToLCID(void) ok(ret > 0, "Expected ret > 0, got %d, error %ld\n", ret, GetLastError()); trace("%08lx, %s\n", lcid, wine_dbgstr_w(buffer)); + pLCIDToLocaleName(GetUserDefaultLCID(), expbuff, LOCALE_NAME_MAX_LENGTH, 0); + ret = pLCIDToLocaleName(LOCALE_NEUTRAL, buffer, LOCALE_NAME_MAX_LENGTH, 0); + ok(ret > 0, "Expected ret > 0, got %d, error %ld\n", ret, GetLastError()); + ok( !wcscmp( buffer, expbuff ), "got %s / %s\n", debugstr_w(buffer), debugstr_w(expbuff)); + + ret = pLCIDToLocaleName(LOCALE_CUSTOM_DEFAULT, buffer, LOCALE_NAME_MAX_LENGTH, 0); + ok(ret > 0, "Expected ret > 0, got %d, error %ld\n", ret, GetLastError()); + ok( !wcscmp( buffer, expbuff ), "got %s / %s\n", debugstr_w(buffer), debugstr_w(expbuff)); + + SetLastError( 0xdeadbeef ); + ret = pLCIDToLocaleName(LOCALE_CUSTOM_UNSPECIFIED, buffer, LOCALE_NAME_MAX_LENGTH, 0); + ok(ret > 0 || broken(!ret), /* <= win8 */ "Expected ret > 0, got %d, error %ld\n", ret, GetLastError()); + if (ret) ok( !wcscmp( buffer, expbuff ), "got %s / %s\n", debugstr_w(buffer), debugstr_w(expbuff)); + + SetLastError( 0xdeadbeef ); + ret = pLCIDToLocaleName(LOCALE_CUSTOM_UI_DEFAULT, buffer, LOCALE_NAME_MAX_LENGTH, 0); + if (ret) trace("%08x, %s\n", GetUserDefaultUILanguage(), wine_dbgstr_w(buffer)); + else ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError()); + /* bad name */ SetLastError(0xdeadbeef); lcid = pLocaleNameToLCID(invalidW, 0); @@ -2886,6 +2920,7 @@ static void test_LocaleNameToLCID(void) str.MaximumLength = sizeof( buffer ); memset( buffer, 0xcc, sizeof(buffer) ); + ok( !IsValidLocale( LOCALE_NEUTRAL, 0 ), "expected invalid\n" ); status = pRtlLcidToLocaleName( LOCALE_NEUTRAL, &str, 0, 0 ); ok( status == STATUS_INVALID_PARAMETER_1, "wrong error %lx\n", status ); status = pRtlLcidToLocaleName( LOCALE_NEUTRAL, &str, 2, 0 ); @@ -2909,12 +2944,14 @@ static void test_LocaleNameToLCID(void) ok( str.Length == wcslen(buffer) * sizeof(WCHAR), "wrong len %u\n", str.Length ); ok( !wcscmp( buffer, L"en" ), "wrong name %s\n", debugstr_w(buffer) ); + ok( IsValidLocale( 0x00010407, 0 ), "expected valid\n" ); memset( buffer, 0xcc, sizeof(buffer) ); status = pRtlLcidToLocaleName( 0x00010407, &str, 0, 0 ); ok( status == STATUS_SUCCESS, "wrong error %lx\n", status ); ok( str.Length == wcslen(buffer) * sizeof(WCHAR), "wrong len %u\n", str.Length ); ok( !wcscmp( buffer, L"de-DE_phoneb" ), "wrong name %s\n", debugstr_w(buffer) ); + ok( !IsValidLocale( LOCALE_SYSTEM_DEFAULT, 0 ), "expected invalid\n" ); memset( buffer, 0xcc, sizeof(buffer) ); status = pRtlLcidToLocaleName( LOCALE_SYSTEM_DEFAULT, &str, 0, 0 ); ok( status == STATUS_SUCCESS, "wrong error %lx\n", status ); @@ -2922,6 +2959,7 @@ static void test_LocaleNameToLCID(void) LCIDToLocaleName( GetSystemDefaultLCID(), expect, ARRAY_SIZE(expect), 0 ); ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_w(buffer), debugstr_w(expect) ); + ok( !IsValidLocale( LOCALE_USER_DEFAULT, 0 ), "expected invalid\n" ); memset( buffer, 0xcc, sizeof(buffer) ); status = pRtlLcidToLocaleName( LOCALE_USER_DEFAULT, &str, 0, 0 ); ok( status == STATUS_SUCCESS, "wrong error %lx\n", status ); @@ -2929,6 +2967,7 @@ static void test_LocaleNameToLCID(void) LCIDToLocaleName( GetUserDefaultLCID(), expect, ARRAY_SIZE(expect), 0 ); ok( !wcscmp( buffer, expect ), "wrong name %s / %s\n", debugstr_w(buffer), debugstr_w(expect) ); + ok( IsValidLocale( LOCALE_INVARIANT, 0 ), "expected valid\n" ); memset( buffer, 0xcc, sizeof(buffer) ); status = pRtlLcidToLocaleName( LOCALE_INVARIANT, &str, 0, 0 ); ok( status == STATUS_SUCCESS, "wrong error %lx\n", status ); @@ -3655,6 +3694,12 @@ static void test_ConvertDefaultLocale(void) LCID_RES(LOCALE_SYSTEM_DEFAULT, GetSystemDefaultLCID()); LCID_RES(LOCALE_USER_DEFAULT, GetUserDefaultLCID()); LCID_RES(LOCALE_NEUTRAL, GetUserDefaultLCID()); + LCID_RES(LOCALE_CUSTOM_DEFAULT, GetUserDefaultLCID()); + lcid = ConvertDefaultLocale( LOCALE_CUSTOM_UNSPECIFIED ); + ok( lcid == GetUserDefaultLCID() || broken(lcid == LOCALE_CUSTOM_UNSPECIFIED), /* <= win8 */ + "wrong lcid %04lx\n", lcid ); + lcid = ConvertDefaultLocale( LOCALE_CUSTOM_UI_DEFAULT ); + ok( lcid == GetUserDefaultUILanguage() || lcid == LOCALE_CUSTOM_UI_DEFAULT, "wrong lcid %04lx\n", lcid ); lcid = ConvertDefaultLocale(LOCALE_INVARIANT); ok(lcid == LOCALE_INVARIANT || broken(lcid == 0x47f) /* win2k[3]/winxp */, "Expected lcid = %08lx, got %08lx\n", LOCALE_INVARIANT, lcid); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 66c9a67cf28..8121efb8651 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -574,6 +574,8 @@ static const NLS_LOCALE_DATA *get_locale_by_id( LCID *lcid, DWORD flags ) case LOCALE_NEUTRAL: case LOCALE_USER_DEFAULT: case LOCALE_CUSTOM_DEFAULT: + case LOCALE_CUSTOM_UNSPECIFIED: + case LOCALE_CUSTOM_UI_DEFAULT: *lcid = user_lcid; return user_locale; default: @@ -5406,9 +5408,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetUserDefaultLocaleName( LPWSTR name, INT len ) */ LANGID WINAPI DECLSPEC_HOTPATCH GetUserDefaultUILanguage(void) { - LANGID lang; - NtQueryDefaultUILanguage( &lang ); - return lang; + return LANGIDFROMLCID( GetUserDefaultLCID() ); } @@ -5708,7 +5708,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLanguageGroup( LGRPID id, DWORD flags ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocale( LCID lcid, DWORD flags ) { - return !!get_locale_by_id( &lcid, LOCALE_ALLOW_NEUTRAL_NAMES ); + switch (lcid) + { + case LOCALE_NEUTRAL: + case LOCALE_USER_DEFAULT: + case LOCALE_SYSTEM_DEFAULT: + return FALSE; + default: + return !!get_locale_by_id( &lcid, LOCALE_ALLOW_NEUTRAL_NAMES ); + } } diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 2421830e7b5..0fd99a40c86 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -262,6 +262,8 @@ find_best_locale_proc( WCHAR *name, DWORD locale_flags, LPARAM lParam ) char buff[MAX_ELEM_LEN]; unsigned int flags = 0; + if (lcid == LOCALE_CUSTOM_UNSPECIFIED) return CONTINUE_LOOKING; + #if _MSVCR_VER >= 110 if (res->allow_sname && compare_info(lcid,LOCALE_SNAME,buff,res->search_language, TRUE)) {

1 0

Alexandre Julliard : kernelbase: Implement NlsValidateLocale().
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 6517f6c239e9f6b7909daefa3680365bbbdbbe1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6517f6c239e9f6b7909daefa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 7 11:21:21 2022 +0200 kernelbase: Implement NlsValidateLocale(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 82 +++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 46 ++++++++++++----------- 3 files changed, 108 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6517f6c239e9f6b7909d…

1 0

Alexandre Julliard : kernelbase: Reimplement Internal_EnumCalendarInfo() using the locale.nls data.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 8576c3e1312faa6e8e6bcdd60f620161b82fd3c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8576c3e1312faa6e8e6bcdd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 7 11:22:45 2022 +0200 kernelbase: Reimplement Internal_EnumCalendarInfo() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 12 +++++++---- dlls/kernelbase/locale.c | 56 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d46a2aa1580..6af66375def 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -38,12 +38,14 @@ #include "winerror.h" #include "winver.h" #include "kernel_private.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nls); -extern BOOL WINAPI Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, LCID lcid, CALID id, +extern const NLS_LOCALE_DATA * WINAPI NlsValidateLocale( LCID *lcid, ULONG flags ); + +extern BOOL WINAPI Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, + const NLS_LOCALE_DATA *locale, CALID id, CALTYPE type, BOOL unicode, BOOL ex, BOOL exex, LPARAM lparam ); extern BOOL WINAPI Internal_EnumDateFormats( DATEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, BOOL unicode, @@ -299,7 +301,8 @@ BOOL WINAPI EnumLanguageGroupLocalesA( LANGGROUPLOCALE_ENUMPROCA proc, LGRPID id */ BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA proc, LCID lcid, CALID id, CALTYPE type ) { - return Internal_EnumCalendarInfo( (CALINFO_ENUMPROCW)proc, lcid, id, type, FALSE, FALSE, FALSE, 0 ); + return Internal_EnumCalendarInfo( (CALINFO_ENUMPROCW)proc, NlsValidateLocale( &lcid, 0 ), + id, type, FALSE, FALSE, FALSE, 0 ); } /****************************************************************************** @@ -307,7 +310,8 @@ BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA proc, LCID lcid, CALID id, CALT */ BOOL WINAPI EnumCalendarInfoExA( CALINFO_ENUMPROCEXA proc, LCID lcid, CALID id, CALTYPE type ) { - return Internal_EnumCalendarInfo( (CALINFO_ENUMPROCW)proc, lcid, id, type, FALSE, TRUE, FALSE, 0 ); + return Internal_EnumCalendarInfo( (CALINFO_ENUMPROCW)proc, NlsValidateLocale( &lcid, 0 ), + id, type, FALSE, TRUE, FALSE, 0 ); } /************************************************************************** diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2c2a47a08b8..4742bed25a1 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1956,6 +1956,14 @@ static WCHAR compose_chars( WCHAR ch1, WCHAR ch2 ) } +static UINT get_locale_codepage( const NLS_LOCALE_DATA *locale, ULONG flags ) +{ + UINT ret = locale->idefaultansicodepage; + if ((flags & LOCALE_USE_CP_ACP) || ret == CP_UTF8) ret = system_locale->idefaultansicodepage; + return ret; +} + + static UINT get_lcid_codepage( LCID lcid, ULONG flags ) { UINT ret = GetACP(); @@ -3627,15 +3635,17 @@ static DWORD get_timezone_id( const TIME_ZONE_INFORMATION *info, LARGE_INTEGER t /****************************************************************************** * Internal_EnumCalendarInfo (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, LCID lcid, CALID id, +BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, + const NLS_LOCALE_DATA *locale, CALID id, CALTYPE type, BOOL unicode, BOOL ex, BOOL exex, LPARAM lparam ) { + const USHORT *calendars; + USHORT cal = id; WCHAR buffer[256]; - CALID calendars[2] = { id }; - INT ret, i; + INT ret, i, count = 1; - if (!proc) + if (!proc || !locale) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; @@ -3643,24 +3653,33 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, if (id == ENUM_ALL_CALENDARS) { - if (!GetLocaleInfoW( lcid, LOCALE_ICALENDARTYPE | LOCALE_RETURN_NUMBER, - (WCHAR *)&calendars[0], sizeof(calendars[0]) / sizeof(WCHAR) )) return FALSE; - if (!GetLocaleInfoW( lcid, LOCALE_IOPTIONALCALENDAR | LOCALE_RETURN_NUMBER, - (WCHAR *)&calendars[1], sizeof(calendars[1]) / sizeof(WCHAR) )) calendars[1] = 0; + count = locale_strings[locale->scalendartype]; + calendars = locale_strings + locale->scalendartype + 1; + } + else if (id <= CAL_UMALQURA) + { + calendars = &cal; + count = 1; + } + else + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; } - for (i = 0; i < ARRAY_SIZE(calendars) && calendars[i]; i++) + for (i = 0; i < count; i++) { id = calendars[i]; if (type & CAL_RETURN_NUMBER) - ret = GetCalendarInfoW( lcid, id, type, NULL, 0, (LPDWORD)buffer ); + ret = get_calendar_info( locale, id, type, NULL, 0, (LPDWORD)buffer ); else if (unicode) - ret = GetCalendarInfoW( lcid, id, type, buffer, ARRAY_SIZE(buffer), NULL ); + ret = get_calendar_info( locale, id, type, buffer, ARRAY_SIZE(buffer), NULL ); else { WCHAR bufW[256]; - ret = GetCalendarInfoW( lcid, id, type, bufW, ARRAY_SIZE(bufW), NULL ); - if (ret) WideCharToMultiByte( CP_ACP, 0, bufW, -1, (char *)buffer, sizeof(buffer), NULL, NULL ); + ret = get_calendar_info( locale, id, type, bufW, ARRAY_SIZE(bufW), NULL ); + if (ret) WideCharToMultiByte( get_locale_codepage( locale, type ), 0, + bufW, -1, (char *)buffer, sizeof(buffer), NULL, NULL ); } if (ret) @@ -4155,7 +4174,8 @@ LCID WINAPI DECLSPEC_HOTPATCH ConvertDefaultLocale( LCID lcid ) BOOL WINAPI DECLSPEC_HOTPATCH EnumCalendarInfoW( CALINFO_ENUMPROCW proc, LCID lcid, CALID id, CALTYPE type ) { - return Internal_EnumCalendarInfo( proc, lcid, id, type, TRUE, FALSE, FALSE, 0 ); + return Internal_EnumCalendarInfo( proc, NlsValidateLocale( &lcid, 0 ), + id, type, TRUE, FALSE, FALSE, 0 ); } @@ -4165,7 +4185,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumCalendarInfoW( CALINFO_ENUMPROCW proc, LCID lc BOOL WINAPI DECLSPEC_HOTPATCH EnumCalendarInfoExW( CALINFO_ENUMPROCEXW proc, LCID lcid, CALID id, CALTYPE type ) { - return Internal_EnumCalendarInfo( (CALINFO_ENUMPROCW)proc, lcid, id, type, TRUE, TRUE, FALSE, 0 ); + return Internal_EnumCalendarInfo( (CALINFO_ENUMPROCW)proc, NlsValidateLocale( &lcid, 0 ), + id, type, TRUE, TRUE, FALSE, 0 ); } /****************************************************************************** @@ -4174,8 +4195,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumCalendarInfoExW( CALINFO_ENUMPROCEXW proc, LCI BOOL WINAPI DECLSPEC_HOTPATCH EnumCalendarInfoExEx( CALINFO_ENUMPROCEXEX proc, LPCWSTR locale, CALID id, LPCWSTR reserved, CALTYPE type, LPARAM lparam ) { - LCID lcid = LocaleNameToLCID( locale, 0 ); - return Internal_EnumCalendarInfo( (CALINFO_ENUMPROCW)proc, lcid, id, type, TRUE, TRUE, TRUE, lparam ); + LCID lcid; + return Internal_EnumCalendarInfo( (CALINFO_ENUMPROCW)proc, get_locale_by_name( locale, &lcid ), + id, type, TRUE, TRUE, TRUE, lparam ); }

1 0

Alexandre Julliard : kernelbase: Reimplement Internal_EnumTimeFormats() using the locale.nls data.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 25595a0abe2f182882e1dac39d9c1a38bc412d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25595a0abe2f182882e1dac3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 7 11:23:20 2022 +0200 kernelbase: Reimplement Internal_EnumTimeFormats() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 7 ++++--- dlls/kernelbase/locale.c | 46 ++++++++++++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 6af66375def..ad84ae58858 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -55,8 +55,8 @@ extern BOOL WINAPI Internal_EnumLanguageGroupLocales( LANGGROUPLOCALE_ENUMPROCW extern BOOL WINAPI Internal_EnumSystemCodePages( CODEPAGE_ENUMPROCW proc, DWORD flags, BOOL unicode ); extern BOOL WINAPI Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); -extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, - BOOL unicode, BOOL ex, LPARAM lparam ); +extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, const NLS_LOCALE_DATA *locale, + DWORD flags, BOOL unicode, BOOL ex, LPARAM lparam ); extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); @@ -350,7 +350,8 @@ BOOL WINAPI EnumTimeFormatsA( TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags ) SetLastError(ERROR_INVALID_FLAGS); return FALSE; } - return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, FALSE, FALSE, 0 ); + return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, NlsValidateLocale( &lcid, 0 ), + flags, FALSE, FALSE, 0 ); } /****************************************************************************** diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4742bed25a1..c20117264b7 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3888,14 +3888,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_E /************************************************************************** * Internal_EnumTimeFormats (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, +BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, + const NLS_LOCALE_DATA *locale, DWORD flags, BOOL unicode, BOOL ex, LPARAM lparam ) { WCHAR buffer[256]; - LCTYPE lctype; - INT ret; + INT ret = TRUE; + const DWORD *array; + DWORD pos, i; - if (!proc) + if (!proc || !locale) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; @@ -3903,10 +3905,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, switch (flags & ~LOCALE_USE_CP_ACP) { case 0: - lctype = LOCALE_STIMEFORMAT; + if (!get_locale_info( locale, 0, LOCALE_STIMEFORMAT, buffer, ARRAY_SIZE(buffer) )) return FALSE; + pos = locale->stimeformat; break; case TIME_NOSECONDS: - lctype = LOCALE_SSHORTTIME; + if (!get_locale_info( locale, 0, LOCALE_SSHORTTIME, buffer, ARRAY_SIZE(buffer) )) return FALSE; + pos = locale->sshorttime; break; default: FIXME( "Unknown time format %lx\n", flags ); @@ -3914,16 +3918,21 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, return FALSE; } - lctype |= flags & LOCALE_USE_CP_ACP; - if (unicode) - ret = GetLocaleInfoW( lcid, lctype, buffer, ARRAY_SIZE(buffer) ); - else - ret = GetLocaleInfoA( lcid, lctype, (char *)buffer, sizeof(buffer) ); - - if (ret) + array = (const DWORD *)(locale_strings + pos + 1); + for (i = 0; ret && i < locale_strings[pos]; i++) { - if (ex) ((TIMEFMT_ENUMPROCEX)proc)( buffer, lparam ); - else proc( buffer ); + if (i) memcpy( buffer, locale_strings + array[i] + 1, + (locale_strings[array[i]] + 1) * sizeof(WCHAR) ); + + if (ex) ret = ((TIMEFMT_ENUMPROCEX)proc)( buffer, lparam ); + else if (unicode) ret = proc( buffer ); + else + { + char buffA[256]; + WideCharToMultiByte( get_locale_codepage( locale, flags ), 0, buffer, -1, + buffA, ARRAY_SIZE(buffA), NULL, NULL ); + ret = proc( (WCHAR *)buffA ); + } } return TRUE; } @@ -4408,7 +4417,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD */ BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsW( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags ) { - return Internal_EnumTimeFormats( proc, lcid, flags, TRUE, FALSE, 0 ); + return Internal_EnumTimeFormats( proc, NlsValidateLocale( &lcid, 0 ), flags, TRUE, FALSE, 0 ); } @@ -4418,8 +4427,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsW( TIMEFMT_ENUMPROCW proc, LCID lci BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsEx( TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, DWORD flags, LPARAM lparam ) { - LCID lcid = LocaleNameToLCID( locale, 0 ); - return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, TRUE, TRUE, lparam ); + LCID lcid; + return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, get_locale_by_name( locale, &lcid ), + flags, TRUE, TRUE, lparam ); }

1 0

Alexandre Julliard : kernelbase: Reimplement Internal_EnumDateFormats() using the locale.nls data.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 4d68497fac6e86592580b0e8661fde296e564f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d68497fac6e86592580b0e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 7 11:23:45 2022 +0200 kernelbase: Reimplement Internal_EnumDateFormats() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 10 +++-- dlls/kernelbase/locale.c | 114 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 87 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d68497fac6e86592580…

1 0

Alexandre Julliard : make_unicode: Update to CLDR version 41.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 6644b6b667e23e315a60758297b96f415346cfb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6644b6b667e23e315a607582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 7 12:07:58 2022 +0200 make_unicode: Update to CLDR version 41. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- nls/locale.nls | Bin 663852 -> 664228 bytes tools/make_unicode | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index aee79e4cb11..2ab7ce55dc9 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index dd96b13d6df..520cbe0f1a5 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -33,8 +33,7 @@ my $REPORTS = "http://www.unicode.org/reports"; my $MSDATA = "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6…"; my $MSCODEPAGES = "$MSDATA/Windows Supported Code Page Data Files.zip"; -#my $CLDRDATA = "https://www.unicode.org/Public/cldr/40/cldr-common-40.0.zip"; -my $CLDRVERSION = "40"; +my $CLDRVERSION = "41"; my $CLDRDATA = "https://github.com/unicode-org/cldr/archive/refs/tags/release-$CLDRVERSION.…"; my $CLDR33DATA = "https://www.unicode.org/Public/cldr/33/cldr-common-33.0.zip"; @@ -987,8 +986,8 @@ my @locales = { name => "ks", lcid => 0x00000060, group => 15, sabbrevlangname => "ZZZ", sopentypelang => "KSH" }, { name => "ks-Arab", lcid => 0x00000460 }, { name => "ks-Arab-IN" }, - { name => "ks-Deva", slist => ",", dir => "seed" }, - { name => "ks-Deva-IN", lcid => 0x00000860, dir => "seed" }, + { name => "ks-Deva", slist => "," }, + { name => "ks-Deva-IN", lcid => 0x00000860 }, { name => "ks-IN", alias => "ks-Arab-IN" }, { name => "ksb" }, { name => "ksb-TZ" },

1 0

Alexandre Julliard : xml2: Import upstream release 2.9.13.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: a279c2783c8cc664921de99d55725784b57074e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a279c2783c8cc664921de99d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 7 12:21:04 2022 +0200 xml2: Import upstream release 2.9.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/xml2/HTMLparser.c | 59 +++++++++++------------ libs/xml2/HTMLtree.c | 52 +++++++++++++-------- libs/xml2/SAX2.c | 31 ++++++------ libs/xml2/catalog.c | 2 + libs/xml2/elfgcchack.h | 12 +++++ libs/xml2/encoding.c | 32 ++++++------- libs/xml2/hash.c | 22 ++++----- libs/xml2/include/libxml/xmlversion.h | 12 ++--- libs/xml2/parser.c | 29 ++++++------ libs/xml2/parserInternals.c | 4 +- libs/xml2/relaxng.c | 2 + libs/xml2/tree.c | 39 ++++++++++------ libs/xml2/uri.c | 15 +++--- libs/xml2/valid.c | 88 ++++++++++++++++++++++------------- libs/xml2/xinclude.c | 14 +++--- libs/xml2/xmlIO.c | 22 +++++++-- libs/xml2/xmlmemory.c | 2 +- libs/xml2/xmlregexp.c | 9 +++- libs/xml2/xmlsave.c | 31 ++++++++---- libs/xml2/xmlschemas.c | 12 +++-- libs/xml2/xmlschemastypes.c | 15 ++++-- libs/xml2/xmlstring.c | 73 +++++++++++++++-------------- libs/xml2/xpath.c | 6 ++- libs/xml2/xpointer.c | 68 +++++++++++---------------- 24 files changed, 373 insertions(+), 278 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a279c2783c8cc664921d…

1 0

Alexandre Julliard : xslt: Import upstream release 1.1.35.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: f3f7dd4dba6e96bd6652f2c3acad7e4ce1cdf353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3f7dd4dba6e96bd6652f2c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 7 12:25:14 2022 +0200 xslt: Import upstream release 1.1.35. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/xslt/libxslt/extensions.c | 6 - libs/xslt/libxslt/extensions.h | 2 +- libs/xslt/libxslt/functions.c | 14 +- libs/xslt/libxslt/numbers.c | 4 +- libs/xslt/libxslt/pattern.c | 464 ++++++++++++++++---------------------- libs/xslt/libxslt/preproc.c | 2 + libs/xslt/libxslt/preproc.h | 2 +- libs/xslt/libxslt/security.c | 2 +- libs/xslt/libxslt/templates.c | 8 + libs/xslt/libxslt/transform.c | 124 +--------- libs/xslt/libxslt/xslt.c | 8 +- libs/xslt/libxslt/xsltInternals.h | 26 ++- libs/xslt/libxslt/xsltconfig.h | 6 +- libs/xslt/libxslt/xsltlocale.c | 3 +- libs/xslt/libxslt/xsltutils.c | 59 ++++- 15 files changed, 304 insertions(+), 426 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3f7dd4dba6e96bd6652…

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.211.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 343ddade5e0486790344195bd4f949228a3b3173 URL: https://source.winehq.org/git/wine.git/?a=commit;h=343ddade5e0486790344195b… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Apr 7 12:26:41 2022 +0200 winevulkan: Update to VK spec version 1.3.211. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 18 ++++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 14 +++++++++++++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 505aaa81c60..c26951d06b9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.210" +VK_XML_VERSION = "1.3.211" WINE_VK_VERSION = (1, 3) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index b04beb4399e..ab9ee691986 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4514,6 +4514,23 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT: + { + const VkPhysicalDeviceImage2DViewOf3DFeaturesEXT *in = (const VkPhysicalDeviceImage2DViewOf3DFeaturesEXT *)in_header; + VkPhysicalDeviceImage2DViewOf3DFeaturesEXT *out; + + if (!(out = malloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->image2DViewOf3D = in->image2DViewOf3D; + out->sampler2DViewOf3D = in->sampler2DViewOf3D; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: { const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *in = (const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE *)in_header; @@ -9686,6 +9703,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_global_priority_query", "VK_EXT_graphics_pipeline_library", "VK_EXT_host_query_reset", + "VK_EXT_image_2d_view_of_3d", "VK_EXT_image_robustness", "VK_EXT_image_view_min_lod", "VK_EXT_index_type_uint8", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 7d14e2ddf6d..2345547ff1d 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.3.210" + "api_version": "1.3.211" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 7ec94394d4d..2a7a02db636 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -487,6 +487,8 @@ #define VK_EXT_IMAGE_VIEW_MIN_LOD_EXTENSION_NAME "VK_EXT_image_view_min_lod" #define VK_EXT_MULTI_DRAW_SPEC_VERSION 1 #define VK_EXT_MULTI_DRAW_EXTENSION_NAME "VK_EXT_multi_draw" +#define VK_EXT_IMAGE_2D_VIEW_OF_3D_SPEC_VERSION 1 +#define VK_EXT_IMAGE_2D_VIEW_OF_3D_EXTENSION_NAME "VK_EXT_image_2d_view_of_3d" #define VK_KHR_PORTABILITY_ENUMERATION_SPEC_VERSION 1 #define VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME "VK_KHR_portability_enumeration" #define VK_EXT_LOAD_STORE_OP_NONE_SPEC_VERSION 1 @@ -525,7 +527,7 @@ #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0) #define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0) -#define VK_HEADER_VERSION 210 +#define VK_HEADER_VERSION 211 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_USE_64_BIT_PTR_DEFINES 0 @@ -2252,6 +2254,7 @@ typedef enum VkImageCreateFlagBits VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV = 0x00002000, VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT = 0x00004000, VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM = 0x00008000, + VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT = 0x00020000, VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT, VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT, VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT, @@ -3765,6 +3768,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT = 1000391001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT = 1000392000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT = 1000392001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT = 1000393000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT = 1000411000, VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT = 1000411001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000, @@ -6561,6 +6565,14 @@ typedef struct VkPhysicalDeviceIDProperties } VkPhysicalDeviceIDProperties; typedef VkPhysicalDeviceIDProperties VkPhysicalDeviceIDPropertiesKHR; +typedef struct VkPhysicalDeviceImage2DViewOf3DFeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 image2DViewOf3D; + VkBool32 sampler2DViewOf3D; +} VkPhysicalDeviceImage2DViewOf3DFeaturesEXT; + typedef struct VkPhysicalDeviceImageFormatInfo2 { VkStructureType sType;

1 0

Nikolay Sivov : wmp: Use CRT allocation functions.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 00291118dbb531d15636c809bcb0eca264716043 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00291118dbb531d15636c809… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 10:53:06 2022 +0300 wmp: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/events.c | 15 +++++++-------- dlls/wmp/oleobj.c | 5 ++--- dlls/wmp/player.c | 40 ++++++++++++++++++++-------------------- dlls/wmp/wmp_private.h | 17 ----------------- 4 files changed, 29 insertions(+), 48 deletions(-) diff --git a/dlls/wmp/events.c b/dlls/wmp/events.c index f541830773b..9f2b1cb4b29 100644 --- a/dlls/wmp/events.c +++ b/dlls/wmp/events.c @@ -152,7 +152,7 @@ static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) if(!ref) { IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); - heap_free(This); + free(This); } return ref; @@ -296,10 +296,9 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * } if(i == This->sinks_size) - This->sinks = heap_realloc(This->sinks, - (++This->sinks_size)*sizeof(*This->sinks)); + This->sinks = realloc(This->sinks, (++This->sinks_size)*sizeof(*This->sinks)); }else { - This->sinks = heap_alloc(sizeof(*This->sinks)); + This->sinks = malloc(sizeof(*This->sinks)); This->sinks_size = 1; i = 0; } @@ -333,7 +332,7 @@ static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, TRACE("(%p)->(%p)\n", This, ppEnum); - ret = heap_alloc(sizeof(*ret)); + ret = malloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -370,14 +369,14 @@ static void ConnectionPoint_Destroy(ConnectionPoint *This) IDispatch_Release(This->sinks[i]); } - heap_free(This->sinks); - heap_free(This); + free(This->sinks); + free(This); } static void ConnectionPoint_Create(REFIID riid, ConnectionPoint **cp, IConnectionPointContainer *container) { - ConnectionPoint *ret = heap_alloc(sizeof(ConnectionPoint)); + ConnectionPoint *ret = malloc(sizeof(ConnectionPoint)); ret->IConnectionPoint_iface.lpVtbl = &ConnectionPointVtbl; diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 5eaa789f87f..e227f91f8ba 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -20,7 +20,6 @@ #include "olectl.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmp); @@ -307,7 +306,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) release_client_site(This); destroy_player(This); ConnectionPointContainer_Destroy(This); - heap_free(This); + free(This); } return ref; @@ -890,7 +889,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - wmp = heap_alloc_zero(sizeof(*wmp)); + wmp = calloc(1, sizeof(*wmp)); if(!wmp) return E_OUTOFMEMORY; diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 7225e7130a9..254d04d23f8 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1741,9 +1741,9 @@ static ULONG WINAPI WMPMedia_Release(IWMPMedia *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->url); - heap_free(This->name); - heap_free(This); + free(This->url); + free(This->name); + free(This); } return ref; @@ -1815,8 +1815,8 @@ static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR name) if (!name) return E_POINTER; - heap_free(This->name); - This->name = heap_strdupW(name); + free(This->name); + This->name = wcsdup(name); return S_OK; } @@ -1990,9 +1990,9 @@ static ULONG WINAPI WMPPlaylist_Release(IWMPPlaylist *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->url); - heap_free(This->name); - heap_free(This); + free(This->url); + free(This->name); + free(This); } return ref; @@ -2060,8 +2060,8 @@ static HRESULT WINAPI WMPPlaylist_put_name(IWMPPlaylist *iface, BSTR name) if (!name) return E_POINTER; - heap_free(This->name); - This->name = heap_strdupW(name); + free(This->name); + This->name = wcsdup(name); return S_OK; } @@ -2282,7 +2282,7 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) HRESULT hr; WCHAR *name_dup; - media = heap_alloc_zero(sizeof(*media)); + media = calloc(1, sizeof(*media)); if (!media) return E_OUTOFMEMORY; @@ -2290,20 +2290,20 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) if (url) { - media->url = heap_strdupW(url); - name_dup = heap_strdupW(url); + media->url = wcsdup(url); + name_dup = wcsdup(url); hr = CreateUri(name_dup, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri); if (FAILED(hr)) { - heap_free(name_dup); + free(name_dup); IWMPMedia_Release(&media->IWMPMedia_iface); return hr; } hr = IUri_GetPath(uri, &path); if (hr != S_OK) { - heap_free(name_dup); + free(name_dup); IUri_Release(uri); IWMPMedia_Release(&media->IWMPMedia_iface); return hr; @@ -2323,8 +2323,8 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) } else { - media->url = heap_strdupW(L""); - media->name = heap_strdupW(L""); + media->url = wcsdup(L""); + media->name = wcsdup(L""); } media->duration = duration; @@ -2343,13 +2343,13 @@ HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlayli { WMPPlaylist *playlist; - playlist = heap_alloc_zero(sizeof(*playlist)); + playlist = calloc(1, sizeof(*playlist)); if (!playlist) return E_OUTOFMEMORY; playlist->IWMPPlaylist_iface.lpVtbl = &WMPPlaylistVtbl; - playlist->url = heap_strdupW(url ? url : L""); - playlist->name = heap_strdupW(name ? name : L""); + playlist->url = wcsdup(url ? url : L""); + playlist->name = wcsdup(name ? name : L""); playlist->ref = 1; playlist->count = count; diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index e1a1e036cd1..ffeaca09a47 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -19,7 +19,6 @@ #define COBJMACROS #include "windows.h" -#include "wine/heap.h" #include "ole2.h" #include "dshow.h" #include "wmp.h" @@ -129,22 +128,6 @@ void unregister_player_msg_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - - if(str) { - size_t size = lstrlenW(str)+1; - ret = heap_alloc(size*sizeof(WCHAR)); - if(ret) - memcpy(ret, str, size*sizeof(WCHAR)); - }else { - ret = NULL; - } - - return ret; -} - static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) { if(!p)

1 0