Ken Thomases : kernel32: Don't release preferred_locales until we' re done with its members.
Module: wine Branch: master Commit: 5a220321dfd96ded46ee95d9ae971f552ba5ffe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a220321dfd96ded46ee95d9ae... Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 8 22:28:07 2007 -0600 kernel32: Don't release preferred_locales until we're done with its members. --- dlls/kernel32/locale.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index fcb8f18..845234d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2842,12 +2842,8 @@ void LOCALE_Init(void) */ all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); - if (preferred_locales) - { - if (CFArrayGetCount( preferred_locales )) - user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ); - CFRelease( preferred_locales ); - } + if (preferred_locales && CFArrayGetCount( preferred_locales )) + user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ); CFRelease( all_locales ); #endif /* __APPLE__ */ @@ -2868,6 +2864,8 @@ void LOCALE_Init(void) lcid_LC_MESSAGES = locale_name.lcid; TRACE( "setting lcid_LC_MESSAGES to '%s'\n", user_locale ); } + if (preferred_locales) + CFRelease( preferred_locales ); #endif NtSetDefaultUILanguage( LANGIDFROMLCID(lcid_LC_MESSAGES) );
participants (1)
-
Alexandre Julliard