wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Mohamad Al-Jaf : propsys: Implement VariantToStringWithDefault.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: bf0f1fdcf80657a42116b79a0953181191cf9221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf0f1fdcf80657a42116b79a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Apr 1 16:10:13 2022 +0300 propsys: Implement VariantToStringWithDefault. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 16 ++++++++++++++++ include/propvarutil.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..cd92912fde5 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,22 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, const WCHAR *default_value) +{ + TRACE("%s, %s.\n", debugstr_variant(pvar), debugstr_w(default_value)); + + if (V_VT(pvar) == (VT_BYREF | VT_VARIANT)) pvar = V_VARIANTREF(pvar); + if (V_VT(pvar) == (VT_BYREF | VT_BSTR) || V_VT(pvar) == VT_BSTR) + { + BSTR ret = V_ISBYREF(pvar) ? *V_BSTRREF(pvar) : V_BSTR(pvar); + return ret ? ret : L""; + } + + return default_value; +} /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..fcc532fd623 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);

1 0

Alexandre Julliard : wrc: Use the locale.nls data to determine a language's codepage.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: f445f21a3881d21687d18d4ba7d8e6a84aabea6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f445f21a3881d21687d18d4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 13:39:58 2022 +0200 wrc: Use the locale.nls data to determine a language's codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/utils.c | 253 +++++++++++++++++------------------------------------- 1 file changed, 78 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f445f21a3881d21687d1…

1 0

Alexandre Julliard : wrc: Store version and characteristics as simple integers.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: d0b7fa9da7539847ebfc6960ff2aedc762218c1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0b7fa9da7539847ebfc6960… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:58:15 2022 +0200 wrc: Store version and characteristics as simple integers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 12 ++++++------ tools/wrc/newstruc.c | 26 -------------------------- tools/wrc/newstruc.h | 4 ---- tools/wrc/parser.y | 32 ++++++++++++++++---------------- tools/wrc/po.c | 4 ++-- tools/wrc/wrctypes.h | 8 ++++---- 6 files changed, 28 insertions(+), 58 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 5282c809f85..81e7a52c9a9 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -247,17 +247,17 @@ static void put_name_id(name_id_t *nid, int upcase, language_t lang) static void put_lvc(lvc_t *lvc) { if(lvc) + { put_word(lvc->language); + put_dword(lvc->version); + put_dword(lvc->characts); + } else + { put_word(0); /* Neutral */ - if(lvc && lvc->version) - put_dword(*lvc->version); - else put_dword(0); - if(lvc && lvc->characts) - put_dword(*lvc->characts); - else put_dword(0); + } } /* diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index b1cd9183640..9602cdfbf92 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -196,32 +196,6 @@ resource_t *new_resource(enum res_e t, void *res, int memopt, language_t lan) return r; } -version_t *new_version(unsigned int v) -{ - version_t *vp = xmalloc(sizeof(version_t)); - *vp = v; - return vp; -} - -characts_t *new_characts(unsigned int c) -{ - characts_t *cp = xmalloc(sizeof(characts_t)); - *cp = c; - return cp; -} - -version_t *dup_version(version_t *v) -{ - if(!v) return NULL; - return new_version(*v); -} - -characts_t *dup_characts(characts_t *c) -{ - if(!c) return NULL; - return new_characts(*c); -} - html_t *new_html(raw_data_t *rd, int *memopt) { html_t *html = xmalloc(sizeof(html_t)); diff --git a/tools/wrc/newstruc.h b/tools/wrc/newstruc.h index dd3215eba8d..7ed386916ab 100644 --- a/tools/wrc/newstruc.h +++ b/tools/wrc/newstruc.h @@ -43,10 +43,6 @@ string_t *new_string(void); toolbar_item_t *new_toolbar_item(void); ani_any_t *new_ani_any(void); resource_t *new_resource(enum res_e t, void *res, int memopt, language_t lan); -version_t *new_version(unsigned int v); -characts_t *new_characts(unsigned int c); -version_t *dup_version(version_t *v); -characts_t *dup_characts(characts_t *c); html_t *new_html(raw_data_t *rd, int *memopt); rcdata_t *new_rcdata(raw_data_t *rd, int *memopt); font_id_t *new_font_id(int size, string_t *face, int weight, int italic); diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index d13d89cdd41..6b362b06b6b 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -155,8 +155,8 @@ static int dont_want_id = 0; /* See language parsing for details */ /* Set to the current options of the currently scanning stringtable */ static int *tagstt_memopt; -static characts_t *tagstt_characts; -static version_t *tagstt_version; +static characts_t tagstt_characts; +static version_t tagstt_version; static const char riff[4] = "RIFF"; /* RIFF file magic for animated cursor/icon */ @@ -180,8 +180,8 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev static event_t *add_event(int key, int id, int flags, event_t *prev); static name_id_t *convert_ctlclass(name_id_t *cls); static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control_t *prev); -static dialog_t *dialog_version(version_t *v, dialog_t *dlg); -static dialog_t *dialog_characteristics(characts_t *c, dialog_t *dlg); +static dialog_t *dialog_version(version_t v, dialog_t *dlg); +static dialog_t *dialog_characteristics(characts_t c, dialog_t *dlg); static dialog_t *dialog_language(language_t l, dialog_t *dlg); static dialog_t *dialog_menu(name_id_t *m, dialog_t *dlg); static dialog_t *dialog_class(name_id_t *n, dialog_t *dlg); @@ -228,8 +228,8 @@ static int rsrcid_to_token(int lookahead); name_id_t *nid; font_id_t *fntid; language_t lan; - version_t *ver; - characts_t *chars; + version_t ver; + characts_t chars; event_t *event; menu_item_t *menitm; itemex_opt_t *exopt; @@ -1727,11 +1727,11 @@ opt_language ; opt_characts - : tCHARACTERISTICS expr { $$ = new_characts($2); } + : tCHARACTERISTICS expr { $$ = $2; } ; opt_version - : tVERSION expr { $$ = new_version($2); } + : tVERSION expr { $$ = $2; } ; /* ------------------------------ Raw data handling ------------------------------ */ @@ -1895,7 +1895,7 @@ static dialog_t *dialog_language(language_t l, dialog_t *dlg) return dlg; } -static dialog_t *dialog_characteristics(characts_t *c, dialog_t *dlg) +static dialog_t *dialog_characteristics(characts_t c, dialog_t *dlg) { assert(dlg != NULL); if(dlg->lvc.characts) @@ -1904,7 +1904,7 @@ static dialog_t *dialog_characteristics(characts_t *c, dialog_t *dlg) return dlg; } -static dialog_t *dialog_version(version_t *v, dialog_t *dlg) +static dialog_t *dialog_version(version_t v, dialog_t *dlg) { assert(dlg != NULL); if(dlg->lvc.version) @@ -2369,8 +2369,8 @@ static resource_t *build_stt_resources(stringtable_t *stthead) int j; unsigned int andsum; unsigned int orsum; - characts_t *characts; - version_t *version; + characts_t characts; + version_t version; if(!stthead) return NULL; @@ -2401,8 +2401,8 @@ static resource_t *build_stt_resources(stringtable_t *stthead) } andsum = ~0; orsum = 0; - characts = NULL; - version = NULL; + characts = 0; + version = 0; /* Check individual memory options and get * the first characteristics/version */ @@ -2426,11 +2426,11 @@ static resource_t *build_stt_resources(stringtable_t *stthead) { if(characts && newstt->entries[j].characts - && *newstt->entries[j].characts != *characts) + && newstt->entries[j].characts != characts) warning("Stringtable's characteristics are not the same (idbase: %d)\n", newstt->idbase); if(version && newstt->entries[j].version - && *newstt->entries[j].version != *version) + && newstt->entries[j].version != version) warning("Stringtable's versions are not the same (idbase: %d)\n", newstt->idbase); } rsc = new_resource(res_stt, newstt, newstt->memopt, newstt->lvc.language); diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 4d472a12a64..266dd3ec2e4 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -86,10 +86,10 @@ static language_t get_default_sublang( language_t lan ) } } -static version_t *get_dup_version( language_t lang ) +static version_t get_dup_version( language_t lang ) { /* English "translations" take precedence over the original rc contents */ - return new_version( is_english( lang ) ? 1 : -1 ); + return is_english( lang ) ? 1 : -1; } static name_id_t *dup_name_id( name_id_t *id ) diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h index 2415ce5f294..b453e2fdb08 100644 --- a/tools/wrc/wrctypes.h +++ b/tools/wrc/wrctypes.h @@ -108,8 +108,8 @@ typedef unsigned int version_t; typedef struct lvc { language_t language; - version_t *version; - characts_t *characts; + version_t version; + characts_t characts; } lvc_t; typedef struct font_id { @@ -428,8 +428,8 @@ typedef struct stt_entry { string_t *str; int id; unsigned int memopt; - characts_t *characts; - version_t *version; + characts_t characts; + version_t version; } stt_entry_t; typedef struct stringtable {

1 0

Alexandre Julliard : wrc: Store language as a simple integer.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 49bea92bdc1e71c9d05c84547dba11798c373ddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=49bea92bdc1e71c9d05c8454… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:58:10 2022 +0200 wrc: Store language as a simple integer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 47 ++++++++++++------------- tools/wrc/newstruc.c | 29 ++++------------ tools/wrc/newstruc.h | 4 +-- tools/wrc/parser.y | 63 ++++++++++++++------------------- tools/wrc/po.c | 98 ++++++++++++++++++++++++++-------------------------- tools/wrc/utils.c | 6 ++-- tools/wrc/utils.h | 2 +- tools/wrc/wrc.c | 23 ++++-------- tools/wrc/wrc.h | 2 +- tools/wrc/wrctypes.h | 11 ++---- 10 files changed, 120 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=49bea92bdc1e71c9d05c…

1 0

Alexandre Julliard : wrc: Remove resource dumping support.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 234710e8f7777796c1a2b0e0d182b68fe88aa0cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=234710e8f7777796c1a2b0e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:58:03 2022 +0200 wrc: Remove resource dumping support. winedump can be used to debug resource contents. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 1 - tools/wrc/dumpres.c | 924 -------------------------------------------------- tools/wrc/dumpres.h | 30 -- tools/wrc/parser.y | 3 - tools/wrc/utils.c | 10 + tools/wrc/utils.h | 1 + tools/wrc/wrc.c | 4 - 7 files changed, 11 insertions(+), 962 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=234710e8f7777796c1a2…

1 0

Alexandre Julliard : wrc: Remove the verify translation mode.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 51d3369334c6050a13be7f0337863fd4ebf145d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51d3369334c6050a13be7f03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:57:57 2022 +0200 wrc: Remove the verify translation mode. It's no longer useful now that we support po files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 1 - tools/wrc/translation.c | 998 ------------------------------------------------ tools/wrc/wrc.c | 12 - tools/wrc/wrc.h | 1 - 4 files changed, 1012 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=51d3369334c6050a13be…

1 0

Alexandre Julliard : widl: Silence error message for unknown languages.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 88dcdbdcc650b3e750521879f9860ab0f90c34b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88dcdbdcc650b3e750521879… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:57:51 2022 +0200 widl: Silence error message for unknown languages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/hash.c | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/tools/widl/hash.c b/tools/widl/hash.c index d65a2513a6d..a50c0905ec3 100644 --- a/tools/widl/hash.c +++ b/tools/widl/hash.c @@ -515,59 +515,6 @@ unsigned int lhash_val_of_name_sys( syskind_t skind, int lcid, const char *lpStr switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { default: - fprintf(stderr, "Unknown lcid %x, treating as latin-based, please report\n", lcid); - /* .. Fall Through .. */ - case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN: - case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE: - case LANG_BELARUSIAN: case LANG_BENGALI: case LANG_BULGARIAN: - case LANG_CATALAN: case LANG_DANISH: case LANG_DIVEHI: - case LANG_DUTCH: case LANG_ENGLISH: case LANG_ESTONIAN: - case LANG_FAEROESE: case LANG_FINNISH: case LANG_FRENCH: - case LANG_GALICIAN: case LANG_GEORGIAN: case LANG_GERMAN: - case LANG_GUJARATI: case LANG_HINDI: case LANG_INDONESIAN: - case LANG_ITALIAN: case LANG_KANNADA: case LANG_KASHMIRI: - case LANG_KAZAK: case LANG_KONKANI: case LANG_KYRGYZ: - case LANG_LATVIAN: case LANG_LITHUANIAN: case LANG_MACEDONIAN: - case LANG_MALAY: case LANG_MALAYALAM: case LANG_MANIPURI: - case LANG_MARATHI: case LANG_MONGOLIAN: case LANG_NEPALI: - case LANG_ORIYA: case LANG_PORTUGUESE: case LANG_PUNJABI: - case LANG_ROMANIAN: case LANG_SANSKRIT: case LANG_SERBIAN: - case LANG_SINDHI: case LANG_SLOVENIAN: case LANG_SWAHILI: - case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL: - case LANG_TATAR: case LANG_TELUGU: case LANG_THAI: - case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK: - case LANG_VIETNAMESE: case LANG_MALTESE: case LANG_IRISH: - case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_TSWANA: - case LANG_XHOSA: case LANG_ZULU: case LANG_WELSH: - case LANG_BRETON: case LANG_SCOTTISH_GAELIC: case LANG_NEUTRAL: -/* some languages not in all windows versions or ReactOS */ -#ifdef LANG_MANX_GAELIC - case LANG_MANX_GAELIC: -#endif -#ifdef LANG_TAJIK - case LANG_TAJIK: -#endif -#ifdef LANG_ROMANSH - case LANG_ROMANSH: -#endif -#ifdef LANG_SUTU - case LANG_SUTU: -#endif -#ifdef LANG_TSONGA - case LANG_TSONGA: -#endif -#ifdef LANG_VENDA - case LANG_VENDA: -#endif -#ifdef LANG_ESPERANTO - case LANG_ESPERANTO: -#endif -#ifdef LANG_WALON - case LANG_WALON: -#endif -#ifdef LANG_CORNISH - case LANG_CORNISH: -#endif nOffset = 16; pnLookup = Lookup_16; break;

1 0

Alexandre Julliard : oleaut32: Silence error message for unknown languages.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 917d4306989ebdf24faefdaec2128b25b64d6b7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=917d4306989ebdf24faefdae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:57:45 2022 +0200 oleaut32: Silence error message for unknown languages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/hash.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c index f1df69ef5e3..896e0ec5d37 100644 --- a/dlls/oleaut32/hash.c +++ b/dlls/oleaut32/hash.c @@ -520,34 +520,6 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { default: - ERR("Unknown lcid %lx, treating as latin-based, please report\n", lcid); - /* .. Fall Through .. */ - case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN: - case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE: - case LANG_BELARUSIAN: case LANG_BENGALI: case LANG_BULGARIAN: - case LANG_CATALAN: case LANG_DANISH: case LANG_DIVEHI: - case LANG_DUTCH: case LANG_ENGLISH: case LANG_ESTONIAN: - case LANG_FAEROESE: case LANG_FINNISH: case LANG_FRENCH: - case LANG_GALICIAN: case LANG_GEORGIAN: case LANG_GERMAN: - case LANG_GUJARATI: case LANG_HINDI: case LANG_INDONESIAN: - case LANG_ITALIAN: case LANG_KANNADA: case LANG_KASHMIRI: - case LANG_KAZAK: case LANG_KONKANI: case LANG_KYRGYZ: - case LANG_LATVIAN: case LANG_LITHUANIAN: case LANG_MACEDONIAN: - case LANG_MALAY: case LANG_MALAYALAM: case LANG_MANIPURI: - case LANG_MARATHI: case LANG_MONGOLIAN: case LANG_NEPALI: - case LANG_ORIYA: case LANG_PORTUGUESE: case LANG_PUNJABI: - case LANG_ROMANIAN: case LANG_SANSKRIT: case LANG_SERBIAN: - case LANG_SINDHI: case LANG_SLOVENIAN: case LANG_SWAHILI: - case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL: - case LANG_TATAR: case LANG_TELUGU: case LANG_THAI: - case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK: - case LANG_VIETNAMESE: case LANG_SCOTTISH_GAELIC: case LANG_MALTESE: - case LANG_MAORI: case LANG_ROMANSH: case LANG_IRISH: - case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU: - case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA: - case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO: - case LANG_WALON: case LANG_CORNISH: case LANG_WELSH: - case LANG_BRETON: case LANG_MANX_GAELIC: nOffset = 16; pnLookup = Lookup_16; break;

1 0

Alexandre Julliard : kernelbase: Check the locale name instead of the LCID to detect changes.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: c30626505b2782decc1370f9f60b82ebfd9f7c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c30626505b2782decc1370f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 16:00:46 2022 +0200 kernelbase: Check the locale name instead of the LCID to detect changes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4f0957ceff6..6bfa9604806 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1543,6 +1543,7 @@ void init_locale( HMODULE module ) void *sort_ptr; WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; DYNAMIC_TIME_ZONE_INFORMATION timezone; + const WCHAR *user_locale_name; DWORD count; SIZE_T size; HKEY hkey; @@ -1621,13 +1622,15 @@ void init_locale( HMODULE module ) /* Update registry contents if the user locale has changed. * This simulates the action of the Windows control panel. */ + user_locale_name = locale_strings + user_locale->sname + 1; count = sizeof(bufferW); - if (!RegQueryValueExW( intl_key, L"Locale", NULL, NULL, (BYTE *)bufferW, &count )) + if (!RegQueryValueExW( intl_key, L"LocaleName", NULL, NULL, (BYTE *)bufferW, &count )) { - if (wcstoul( bufferW, NULL, 16 ) == user_lcid) return; /* already set correctly */ - TRACE( "updating registry, locale changed %s -> %08lx\n", debugstr_w(bufferW), user_lcid ); + if (!wcscmp( bufferW, user_locale_name )) return; /* unchanged */ + TRACE( "updating registry, locale changed %s -> %s\n", + debugstr_w(bufferW), debugstr_w(user_locale_name) ); } - else TRACE( "updating registry, locale changed none -> %08lx\n", user_lcid ); + else TRACE( "updating registry, locale changed none -> %s\n", debugstr_w(user_locale_name) ); update_locale_registry();

1 0

Alexandre Julliard : kernelbase: Set system/user locales by name if they have no LCID.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: c0ff1a221be311534db72e9ff316287eb6b31351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ff1a221be311534db72e9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 15:24:59 2022 +0200 kernelbase: Set system/user locales by name if they have no LCID. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 997c7b6f4bc..4f0957ceff6 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1547,12 +1547,32 @@ void init_locale( HMODULE module ) SIZE_T size; HKEY hkey; + kernelbase_handle = module; load_locale_nls(); + NtQueryDefaultLocale( FALSE, &system_lcid ); NtQueryDefaultLocale( FALSE, &user_lcid ); - system_locale = get_locale_by_id( &system_lcid, 0 ); - user_locale = get_locale_by_id( &user_lcid, 0 ); - kernelbase_handle = module; + if (!(system_locale = get_locale_by_id( &system_lcid, 0 ))) + { + if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) )) + { + system_locale = get_locale_by_name( bufferW, &system_lcid ); + if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = LOCALE_CUSTOM_DEFAULT; + } + } + if (!(user_locale = get_locale_by_id( &user_lcid, 0 ))) + { + if (GetEnvironmentVariableW( L"WINEUSERLOCALE", bufferW, ARRAY_SIZE(bufferW) )) + { + user_locale = get_locale_by_name( bufferW, &user_lcid ); + if (user_lcid == LOCALE_CUSTOM_UNSPECIFIED) user_lcid = LOCALE_CUSTOM_DEFAULT; + } + else + { + user_locale = system_locale; + user_lcid = system_lcid; + } + } if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022