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

Alexandre Julliard : kernelbase: Reimplement LOCALE_ICOUNTRY/IGEOID in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: f0d43939ffead35bafdb2dc46b2402f0d3d2675e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0d43939ffead35bafdb2dc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:36:46 2022 +0200 kernelbase: Reimplement LOCALE_ICOUNTRY/IGEOID in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 98e0041f901..2a74cab6500 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -923,7 +923,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snativelangname, type, buffer, len ); case LOCALE_ICOUNTRY: - return -1; + return locale_return_number( locale->icountry, type, buffer, len ); case LOCALE_SLOCALIZEDCOUNTRYNAME: /* FIXME: localization */ @@ -939,7 +939,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale->idefaultlanguage, type, buffer, len ); case LOCALE_IDEFAULTCOUNTRY: - return -1; + return locale_return_number( locale->icountry, type, buffer, len ); case LOCALE_IDEFAULTCODEPAGE: val = locale->idefaultcodepage == CP_UTF8 ? CP_OEMCP : locale->idefaultcodepage; @@ -1119,7 +1119,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->siso3166ctryname, type, buffer, len ); case LOCALE_IGEOID: - return -1; + return locale_return_number( locale->igeoid, type, buffer, len ); case LOCALE_SNAME: if (SORTIDFROMLCID(lcid)) /* custom sort locale */

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_SNATIVEDIGITS in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: ec5d3c9fe753f53f6efe6d308b5d40bbbc1f052a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec5d3c9fe753f53f6efe6d30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:02 2022 +0200 kernelbase: Reimplement LOCALE_SNATIVEDIGITS in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 33 +++++++++++++++++++++++++++++++-- dlls/usp10/tests/usp10.c | 4 ---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2a74cab6500..16b923915a9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -896,6 +896,35 @@ static int locale_return_strarray( DWORD pos, WORD idx, LCTYPE type, WCHAR *buff } +static int locale_return_strarray_concat( DWORD pos, LCTYPE type, WCHAR *buffer, int len ) +{ + WORD i, count = locale_strings[pos]; + const DWORD *array = (const DWORD *)(locale_strings + pos + 1); + int ret; + + if (type & LOCALE_RETURN_NUMBER) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + for (i = 0, ret = 1; i < count; i++) ret += locale_strings[array[i]]; + + if (!len) return ret; + if (ret > len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + for (i = 0; i < count; i++) + { + memcpy( buffer, locale_strings + array[i] + 1, locale_strings[array[i]] * sizeof(WCHAR) ); + buffer += locale_strings[array[i]]; + } + *buffer = 0; + return ret; +} + + /* get locale information from the locale.nls file */ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) @@ -967,7 +996,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SNATIVEDIGITS: - return -1; + return locale_return_strarray_concat( locale->snativedigits, type, buffer, len ); case LOCALE_SCURRENCY: return locale_return_string( locale->scurrency, type, buffer, len ); @@ -1285,7 +1314,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IDIGITSUBSTITUTION: - return -1; + return locale_return_number( locale->idigitsubstitution, type, buffer, len ); } SetLastError( ERROR_INVALID_FLAGS ); return 0; diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index c18076bab53..aee751423b3 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3613,7 +3613,6 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l SCRIPT_CONTROL sc; SCRIPT_STATE ss; LCID lcid_old; - BOOL todo; if (!IsValidLocale(lcid, LCID_INSTALLED)) return TRUE; @@ -3624,10 +3623,7 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l lcid_old = GetThreadLocale(); if (!SetThreadLocale(lcid)) return TRUE; - todo = !GetLocaleInfoW(lcid, LOCALE_IDIGITSUBSTITUTION | LOCALE_RETURN_NUMBER, NULL, 0); - hr = ScriptRecordDigitSubstitution(lcid, &sds); - todo_wine_if( todo ) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ScriptApplyDigitSubstitution(&sds, &sc, &ss);

1 0

Alexandre Julliard : kernelbase: Reimplement date/time format strings in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 30e8a28c3df80ce9549ff3b43c8935b28936e1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e8a28c3df80ce9549ff3b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:12 2022 +0200 kernelbase: Reimplement date/time format strings in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 16b923915a9..529cc663cd5 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1030,10 +1030,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SSHORTDATE: - return -1; + return locale_return_strarray( locale->sshortdate, 0, type, buffer, len ); case LOCALE_SLONGDATE: - return -1; + return locale_return_strarray( locale->slongdate, 0, type, buffer, len ); case LOCALE_IDATE: return -1; @@ -1159,7 +1159,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sname, type, buffer, len ); case LOCALE_SDURATION: - return -1; + return locale_return_strarray( locale->sduration, 0, type, buffer, len ); case LOCALE_SKEYBOARDSTOINSTALL: return -1; @@ -1227,10 +1227,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_data( spermille, ARRAY_SIZE(spermille), type, buffer, len ); case LOCALE_SMONTHDAY: - return -1; + return locale_return_strarray( locale->smonthday, 0, type, buffer, len ); case LOCALE_SSHORTTIME: - return -1; + return locale_return_strarray( locale->sshorttime, 0, type, buffer, len ); case LOCALE_SOPENTYPELANGUAGETAG: return -1; @@ -1239,7 +1239,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SRELATIVELONGDATE: - return -1; + return locale_return_string( locale->srelativelongdate, type, buffer, len ); case 0x007d: /* undocumented */ return -1; @@ -1257,7 +1257,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sengcountry, type, buffer, len ); case LOCALE_STIMEFORMAT: - return -1; + return locale_return_strarray( locale->stimeformat, 0, type, buffer, len ); case LOCALE_IDEFAULTANSICODEPAGE: val = locale->idefaultansicodepage == CP_UTF8 ? CP_ACP : locale->idefaultansicodepage; @@ -1267,7 +1267,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SYEARMONTH: - return -1; + return locale_return_strarray( locale->syearmonth, 0, type, buffer, len ); case LOCALE_SENGCURRNAME: return locale_return_string( locale->sengcurrname, type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement calendar options in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 00fd05d4478317fa9c0395288a72b74fb760fd6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=00fd05d4478317fa9c039528… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:18 2022 +0200 kernelbase: Reimplement calendar options in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 529cc663cd5..3095234bd9b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1276,19 +1276,19 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snativecurrname, type, buffer, len ); case LOCALE_ICALENDARTYPE: - return -1; + return locale_return_number( locale_strings[locale->scalendartype + 1], type, buffer, len ); case LOCALE_IPAPERSIZE: return -1; case LOCALE_IOPTIONALCALENDAR: - return -1; + return locale_return_number( locale_strings[locale->scalendartype + 2], type, buffer, len ); case LOCALE_IFIRSTDAYOFWEEK: - return -1; + return locale_return_number( (locale->ifirstdayofweek + 6) % 7, type, buffer, len ); case LOCALE_IFIRSTWEEKOFYEAR: - return -1; + return locale_return_number( locale->ifirstweekofyear, type, buffer, len ); case LOCALE_SMONTHNAME13: return locale_return_strarray( ((type & LOCALE_RETURN_GENITIVE_NAMES) && locale->sgenitivemonth) ?

1 0

Alexandre Julliard : kernelbase: Reimplement misc format values in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 712e4757c6d877bad2902f426195dd3c89ffe23b URL: https://source.winehq.org/git/wine.git/?a=commit;h=712e4757c6d877bad2902f42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:29 2022 +0200 kernelbase: Reimplement misc format values in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 3095234bd9b..967757f91e1 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -978,7 +978,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_IMEASURE: - return -1; + return locale_return_number( locale->imeasure, type, buffer, len ); case LOCALE_SDECIMAL: return -1; @@ -1203,7 +1203,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->senglanguage, type, buffer, len ); case LOCALE_IREADINGLAYOUT: - return -1; + return locale_return_number( locale->ireadinglayout, type, buffer, len ); case LOCALE_INEUTRAL: return -1; @@ -1279,7 +1279,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale_strings[locale->scalendartype + 1], type, buffer, len ); case LOCALE_IPAPERSIZE: - return -1; + return locale_return_number( locale->ipapersize, type, buffer, len ); case LOCALE_IOPTIONALCALENDAR: return locale_return_number( locale_strings[locale->scalendartype + 2], type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_FONTSIGNATURE/SOPENTYPELANGUAGETAG in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: d39c6851d3b449cfe1a77dab4d1379a17d48861d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d39c6851d3b449cfe1a77dab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 20:33:04 2022 +0200 kernelbase: Reimplement LOCALE_FONTSIGNATURE/SOPENTYPELANGUAGETAG in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 967757f91e1..8cb2120357c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1139,7 +1139,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_FONTSIGNATURE: - return -1; + return locale_return_data( locale_strings + locale->fontsignature + 1, + locale_strings[locale->fontsignature], type, buffer, len ); case LOCALE_SISO639LANGNAME: return locale_return_string( locale->siso639langname, type, buffer, len ); @@ -1233,7 +1234,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_strarray( locale->sshorttime, 0, type, buffer, len ); case LOCALE_SOPENTYPELANGUAGETAG: - return -1; + return locale_return_string( locale->sopentypelanguagetag, type, buffer, len ); case LOCALE_SSORTLOCALE: return -1;

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_SSORTNAME in GetLocaleInfoW/Ex.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 6549f1f3d2f5aadb7f2a19680076b5606d9663ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6549f1f3d2f5aadb7f2a1968… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 20:33:32 2022 +0200 kernelbase: Reimplement LOCALE_SSORTNAME in GetLocaleInfoW/Ex. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 8cb2120357c..31a81fc167c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -925,11 +925,88 @@ static int locale_return_strarray_concat( DWORD pos, LCTYPE type, WCHAR *buffer, } +/* FIXME: hardcoded, sortname is apparently not available in locale.nls */ +static const WCHAR *get_locale_sortname( LCID lcid ) +{ + switch (PRIMARYLANGID( lcid )) + { + case LANG_CHINESE: + switch (SORTIDFROMLCID( lcid )) + { + case SORT_CHINESE_PRCP: + switch (SUBLANGID( lcid )) + { + case SUBLANG_CHINESE_TRADITIONAL: + case SUBLANG_CHINESE_HONGKONG: + case 0x1f: + return L"Stroke Count"; + default: + return L"Pronunciation"; + } + case SORT_CHINESE_UNICODE: return L"Unicode"; + case SORT_CHINESE_PRC: return L"Stroke Count"; + case SORT_CHINESE_BOPOMOFO: return L"Bopomofo"; + case SORT_CHINESE_RADICALSTROKE: return L"Radical/Stroke"; + case 5: return L"Surname"; + } + break; + + case LANG_GEORGIAN: + if (SORTIDFROMLCID( lcid ) == SORT_GEORGIAN_MODERN) return L"Modern"; + return L"Traditional"; + + case LANG_GERMAN: + switch (SUBLANGID( lcid )) + { + case SUBLANG_NEUTRAL: + case SUBLANG_DEFAULT: + if (SORTIDFROMLCID( lcid ) == SORT_GERMAN_PHONE_BOOK) return L"Phone Book (DIN)"; + return L"Dictionary"; + } + break; + + case LANG_HUNGARIAN: + if (SORTIDFROMLCID( lcid ) == SORT_HUNGARIAN_TECHNICAL) return L"Technical"; + break; + + case LANG_INVARIANT: + if (SORTIDFROMLCID( lcid ) == SORT_INVARIANT_MATH) return L"Default"; + return L"Maths Alphanumerics"; + + case LANG_JAPANESE: + switch (SORTIDFROMLCID( lcid )) + { + case SORT_JAPANESE_XJIS: return L"XJIS"; + case SORT_JAPANESE_UNICODE: return L"Unicode"; + case SORT_JAPANESE_RADICALSTROKE: return L"Radical/Stroke"; + } + break; + + case LANG_KOREAN: + if (SORTIDFROMLCID( lcid ) == SORT_KOREAN_UNICODE) return L"Unicode"; + return L"Dictionary"; + + case LANG_SPANISH: + switch (SUBLANGID( lcid )) + { + case SUBLANG_NEUTRAL: + case SUBLANG_SPANISH_MODERN: + return L"International"; + case SUBLANG_DEFAULT: + return L"Traditional"; + } + break; + } + return L"Default"; +} + + /* get locale information from the locale.nls file */ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE type, WCHAR *buffer, int len ) { static const WCHAR spermille[] = { 0x2030, 0 }; /* this one seems hardcoded */ + const WCHAR *sort; UINT val; if (locale != user_locale) type |= LOCALE_NOUSEROVERRIDE; @@ -1312,7 +1389,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale->idefaultebcdiccodepage, type, buffer, len ); case LOCALE_SSORTNAME: - return -1; + sort = get_locale_sortname( lcid ); + return locale_return_data( sort, wcslen(sort) + 1, type, buffer, len ); case LOCALE_IDIGITSUBSTITUTION: return locale_return_number( locale->idigitsubstitution, type, buffer, len );

1 0

Nikolay Sivov : opcservices: Use CRT allocation functions.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: ea15c212e375fe28d878265f6a9905af766d242d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea15c212e375fe28d878265f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:51:57 2022 +0300 opcservices: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/compress.c | 19 +++++++-------- dlls/opcservices/factory.c | 6 ++--- dlls/opcservices/opc_private.h | 3 +-- dlls/opcservices/package.c | 54 +++++++++++++++++++++--------------------- dlls/opcservices/uri.c | 20 ++++++++-------- 5 files changed, 50 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea15c212e375fe28d878…

1 0

Nikolay Sivov : opcservices/tests: Use wide strings in test data.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: f859e8b2eb8fa3c3b08d893eadf5b610ff8e5fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f859e8b2eb8fa3c3b08d893e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:51:58 2022 +0300 opcservices/tests: Use wide strings in test data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/opcservices.c | 187 +++++++++++++---------------------- 1 file changed, 69 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f859e8b2eb8fa3c3b08d…

1 0

Nikolay Sivov : xmllite: Use CRT allocation functions.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: dbd4f9e91df8a900c9e6ddfc497e7f8c6646261f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbd4f9e91df8a900c9e6ddfc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:55:19 2022 +0300 xmllite: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 16 ++++------------ dlls/xmllite/writer.c | 21 +++++---------------- dlls/xmllite/xmllite_private.h | 8 +++----- 3 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ccdc1ae2c1b..8d893b51f04 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3632,11 +3632,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (imalloc) - reader = IMalloc_Alloc(imalloc, sizeof(*reader)); - else - reader = heap_alloc(sizeof(*reader)); - if (!reader) + if (!(reader = m_alloc(imalloc, sizeof(*reader)))) return E_OUTOFMEMORY; memset(reader, 0, sizeof(*reader)); @@ -3682,21 +3678,17 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, if (!stream || !ppInput) return E_INVALIDARG; - if (imalloc) - readerinput = IMalloc_Alloc(imalloc, sizeof(*readerinput)); - else - readerinput = heap_alloc(sizeof(*readerinput)); - if(!readerinput) return E_OUTOFMEMORY; + if (!(readerinput = m_alloc(imalloc, sizeof(*readerinput)))) + return E_OUTOFMEMORY; + memset(readerinput, 0, sizeof(*readerinput)); readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinputvtbl; readerinput->ref = 1; readerinput->imalloc = imalloc; - readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); readerinput->encoding = parse_encoding_name(encoding, -1); readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); - readerinput->pending = 0; hr = alloc_input_buffer(readerinput); if (hr != S_OK) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index ac02bd4c200..58d9edea059 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1865,13 +1865,8 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (imalloc) - writer = IMalloc_Alloc(imalloc, sizeof(*writer)); - else - writer = heap_alloc(sizeof(*writer)); - if (!writer) + if (!(writer = m_alloc(imalloc, sizeof(*writer)))) return E_OUTOFMEMORY; - memset(writer, 0, sizeof(*writer)); writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl; @@ -1899,12 +1894,9 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco *out = NULL; - if (imalloc) - writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); - else - writeroutput = heap_alloc(sizeof(*writeroutput)); - if (!writeroutput) + if (!(writeroutput = m_alloc(imalloc, sizeof(*writeroutput)))) return E_OUTOFMEMORY; + memset(writeroutput, 0, sizeof(*writeroutput)); writeroutput->IXmlWriterOutput_iface.lpVtbl = &xmlwriteroutputvtbl; writeroutput->ref = 1; @@ -1912,21 +1904,18 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = encoding; - writeroutput->stream = NULL; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface); return hr; } - if (encoding_name) { + if (encoding_name) + { unsigned int size = (lstrlenW(encoding_name) + 1) * sizeof(WCHAR); writeroutput->encoding_name = writeroutput_alloc(writeroutput, size); memcpy(writeroutput->encoding_name, encoding_name, size); } - else - writeroutput->encoding_name = NULL; - writeroutput->written = 0; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 10f43760b41..03653bbe371 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -21,14 +21,12 @@ #ifndef __XMLLITE_PRIVATE__ #define __XMLLITE_PRIVATE__ -#include "wine/heap.h" - static inline void *m_alloc(IMalloc *imalloc, size_t len) { if (imalloc) return IMalloc_Alloc(imalloc, len); else - return heap_alloc(len); + return malloc(len); } static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) @@ -36,7 +34,7 @@ static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) if (imalloc) return IMalloc_Realloc(imalloc, mem, len); else - return heap_realloc(mem, len); + return realloc(mem, len); } static inline void m_free(IMalloc *imalloc, void *mem) @@ -44,7 +42,7 @@ static inline void m_free(IMalloc *imalloc, void *mem) if (imalloc) IMalloc_Free(imalloc, mem); else - heap_free(mem); + free(mem); } typedef enum

1 0