May 2019 - Wine-commits - list.winehq.org

Zebediah Figura : strmbase: Don't store the media type list locally.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: a2258e717c908fb634145116d2622a5391ed7f38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2258e717c908fb634145116… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 14 19:41:57 2019 -0500 strmbase: Don't store the media type list locally. It's just entirely unnecessary. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index cd8e909..743936f 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -80,7 +80,6 @@ void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType) typedef struct tagENUMEDIADETAILS { ULONG cMediaTypes; - AM_MEDIA_TYPE * pMediaTypes; } ENUMMEDIADETAILS; typedef struct IEnumMediaTypesImpl @@ -129,18 +128,6 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e } pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; - pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); - memset(pEnumMediaTypes->enumMediaDetails.pMediaTypes, 0, sizeof(AM_MEDIA_TYPE) * i); - for (i = 0; i < pEnumMediaTypes->enumMediaDetails.cMediaTypes; i++) - { - HRESULT hr; - - if (FAILED(hr = enumFunc(basePin, i, &pEnumMediaTypes->enumMediaDetails.pMediaTypes[i]))) - { - IEnumMediaTypes_Release(&pEnumMediaTypes->IEnumMediaTypes_iface); - return hr; - } - } *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; pEnumMediaTypes->currentVersion = versionFunc(basePin); return S_OK; @@ -184,10 +171,6 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) if (!ref) { - ULONG i; - for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) - FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); - CoTaskMemFree(This->enumMediaDetails.pMediaTypes); IPin_Release(&This->basePin->IPin_iface); CoTaskMemFree(This); } @@ -212,13 +195,16 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cM { ULONG i; for (i = 0; i < cFetched; i++) - if (!(ppMediaTypes[i] = CreateMediaType(&This->enumMediaDetails.pMediaTypes[This->uIndex + i]))) + { + if (!(ppMediaTypes[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))) + || FAILED(This->enumMediaFunction(This->basePin, This->uIndex + i, ppMediaTypes[i]))) { while (i--) DeleteMediaType(ppMediaTypes[i]); *pcFetched = 0; return E_OUTOFMEMORY; } + } } if ((cMediaTypes != 1) || pcFetched) @@ -256,30 +242,13 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) TRACE("(%p)->()\n", iface); - for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) - FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); - CoTaskMemFree(This->enumMediaDetails.pMediaTypes); - i = 0; while (This->enumMediaFunction(This->basePin, i, &amt) == S_OK) { FreeMediaType(&amt); i++; } - This->enumMediaDetails.cMediaTypes = i; - This->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); - for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) - { - if (FAILED(This->enumMediaFunction(This->basePin, i, &This->enumMediaDetails.pMediaTypes[i]))) - { - while (i--) - FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); - CoTaskMemFree(This->enumMediaDetails.pMediaTypes); - return E_OUTOFMEMORY; - } - } - This->currentVersion = This->mediaVersionFunction(This->basePin); This->uIndex = 0;

1 0

Zebediah Figura : strmbase: Get rid of the ENUMMEDIADETAILS structure.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 8ba451f85b7facbf902339ef0dd3c67460da672f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ba451f85b7facbf902339ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 14 19:41:58 2019 -0500 strmbase: Get rid of the ENUMMEDIADETAILS structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 743936f..8ad2e22 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -77,11 +77,6 @@ void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType) CoTaskMemFree(pMediaType); } -typedef struct tagENUMEDIADETAILS -{ - ULONG cMediaTypes; -} ENUMMEDIADETAILS; - typedef struct IEnumMediaTypesImpl { IEnumMediaTypes IEnumMediaTypes_iface; @@ -90,7 +85,7 @@ typedef struct IEnumMediaTypesImpl BasePin_GetMediaType enumMediaFunction; BasePin_GetMediaTypeVersion mediaVersionFunction; LONG currentVersion; - ENUMMEDIADETAILS enumMediaDetails; + ULONG count; ULONG uIndex; } IEnumMediaTypesImpl; @@ -127,7 +122,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e i++; } - pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; + pEnumMediaTypes->count = i; *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; pEnumMediaTypes->currentVersion = versionFunc(basePin); return S_OK; @@ -184,7 +179,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cM TRACE("(%p)->(%u, %p, %p)\n", iface, cMediaTypes, ppMediaTypes, pcFetched); - cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; + cFetched = min(This->count, This->uIndex + cMediaTypes) - This->uIndex; if (This->currentVersion != This->mediaVersionFunction(This->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; @@ -226,7 +221,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cM if (This->currentVersion != This->mediaVersionFunction(This->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; - if (This->uIndex + cMediaTypes < This->enumMediaDetails.cMediaTypes) + if (This->uIndex + cMediaTypes < This->count) { This->uIndex += cMediaTypes; return S_OK; @@ -248,7 +243,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) FreeMediaType(&amt); i++; } - This->enumMediaDetails.cMediaTypes = i; + This->count = i; This->currentVersion = This->mediaVersionFunction(This->basePin); This->uIndex = 0;

1 0

Zebediah Figura : strmbase: Return void from BaseFilter_Init().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 38726831c4c5081c4a0a97714f5eb83d6c4de939 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38726831c4c5081c4a0a9771… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 14 19:41:59 2019 -0500 strmbase: Return void from BaseFilter_Init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 18 +++++------------- dlls/strmbase/filter.c | 5 ++--- include/wine/strmbase.h | 3 ++- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 8fad7f7..12b62a4 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -254,15 +254,14 @@ static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = IUnknown* WINAPI QCAP_createAudioCaptureFilter(IUnknown *outer, HRESULT *phr) { - HRESULT hr; AudioRecord *This = NULL; FIXME("(%p, %p): the entire CLSID_AudioRecord implementation is just stubs\n", outer, phr); This = CoTaskMemAlloc(sizeof(*This)); if (This == NULL) { - hr = E_OUTOFMEMORY; - goto end; + *phr = E_OUTOFMEMORY; + return NULL; } memset(This, 0, sizeof(*This)); This->IUnknown_iface.lpVtbl = &UnknownVtbl; @@ -272,16 +271,9 @@ IUnknown* WINAPI QCAP_createAudioCaptureFilter(IUnknown *outer, HRESULT *phr) else This->outerUnknown = &This->IUnknown_iface; - hr = BaseFilter_Init(&This->filter, &AudioRecordVtbl, &CLSID_AudioRecord, + BaseFilter_Init(&This->filter, &AudioRecordVtbl, &CLSID_AudioRecord, (DWORD_PTR)(__FILE__ ": AudioRecord.csFilter"), &AudioRecordFuncs); -end: - *phr = hr; - if (SUCCEEDED(hr)) { - return (IUnknown*)&This->filter.IBaseFilter_iface; - } else { - if (This) - IBaseFilter_Release(&This->filter.IBaseFilter_iface); - return NULL; - } + *phr = S_OK; + return (IUnknown*)&This->filter.IBaseFilter_iface; } diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 44e0188..3a39ec4 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -210,7 +210,8 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter *filter) InterlockedIncrement(&filter->pin_version); } -HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable) +void BaseFilter_Init(BaseFilter *This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, + DWORD_PTR DebugInfo, const BaseFilterFuncTable *pBaseFuncsTable) { This->IBaseFilter_iface.lpVtbl = Vtbl; This->refCount = 1; @@ -224,8 +225,6 @@ HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, c This->pin_version = 1; This->pFuncsTable = pBaseFuncsTable; - - return S_OK; } HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 4e0d190..eb0bfbf 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -190,7 +190,8 @@ HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVend VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); -HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable); +void BaseFilter_Init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, + const CLSID *clsid, DWORD_PTR debug_info, const BaseFilterFuncTable *func_table); HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This); /* Enums */

1 0

Zebediah Figura : strmbase: Get rid of the "filterVtbl" parameter to TransformFilter_Construct().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 0f9e4cd6600713628c92e3ceb40bd8aa38084f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f9e4cd6600713628c92e3ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 14 19:42:00 2019 -0500 strmbase: Get rid of the "filterVtbl" parameter to TransformFilter_Construct(). Reordering some functions to avoid forward declarations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 24 +---- dlls/quartz/avidec.c | 24 +---- dlls/strmbase/transform.c | 213 ++++++++++++++++++++++----------------- dlls/winegstreamer/gsttffilter.c | 23 +---- dlls/wineqtdecoder/qtvdecoder.c | 24 +---- include/wine/strmbase.h | 8 +- 6 files changed, 127 insertions(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f9e4cd6600713628c92…

1 0

Huw Davies : kernel32: Replace macros with inline helpers.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 9fbfcbe1bfb863fb13e770c630e1f57a109b690c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fbfcbe1bfb863fb13e770c6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 15 11:45:49 2019 +0100 kernel32: Replace macros with inline helpers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 4174289..e7f5f0e 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -53,11 +53,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); #define CALINFO_MAX_YEAR 2029 -#define LL2FILETIME( ll, pft )\ - (pft)->dwLowDateTime = (UINT)(ll); \ - (pft)->dwHighDateTime = (UINT)((ll) >> 32); -#define FILETIME2LL( pft, ll) \ - ll = (((LONGLONG)((pft)->dwHighDateTime))<<32) + (pft)-> dwLowDateTime ; +static inline void longlong_to_filetime( LONGLONG t, FILETIME *ft ) +{ + ft->dwLowDateTime = (DWORD)t; + ft->dwHighDateTime = (DWORD)(t >> 32); +} + +static inline LONGLONG filetime_to_longlong( const FILETIME *ft ) +{ + return (((LONGLONG)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; +} static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; @@ -177,9 +182,9 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, } if (!islocal) { - FILETIME2LL( lpFileTime, llTime ); + llTime = filetime_to_longlong( lpFileTime ); llTime -= pTZinfo->Bias * (LONGLONG)600000000; - LL2FILETIME( llTime, &ftTemp) + longlong_to_filetime( llTime, &ftTemp ); lpFileTime = &ftTemp; } @@ -188,7 +193,7 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, if (!islocal) { llTime -= pTZinfo->DaylightBias * (LONGLONG)600000000; - LL2FILETIME( llTime, &ftTemp) + longlong_to_filetime( llTime, &ftTemp ); FileTimeToSystemTime(lpFileTime, &SysTime); } @@ -205,7 +210,7 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, if (!islocal) { llTime -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias ) * (LONGLONG)600000000; - LL2FILETIME( llTime, &ftTemp) + longlong_to_filetime( llTime, &ftTemp ); FileTimeToSystemTime(lpFileTime, &SysTime); } @@ -694,12 +699,12 @@ BOOL WINAPI SystemTimeToTzSpecificLocalTime( if (!SystemTimeToFileTime(lpUniversalTime, &ft)) return FALSE; - FILETIME2LL( &ft, llTime) + llTime = filetime_to_longlong( &ft ); if (!TIME_GetTimezoneBias(&tzinfo, &ft, FALSE, &lBias)) return FALSE; /* convert minutes to 100-nanoseconds-ticks */ llTime -= (LONGLONG)lBias * 600000000; - LL2FILETIME( llTime, &ft) + longlong_to_filetime( llTime, &ft ); return FileTimeToSystemTime(&ft, lpLocalTime); } @@ -739,12 +744,12 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime( if (!SystemTimeToFileTime(lpLocalTime, &ft)) return FALSE; - FILETIME2LL( &ft, t) + t = filetime_to_longlong( &ft ); if (!TIME_GetTimezoneBias(&tzinfo, &ft, TRUE, &lBias)) return FALSE; /* convert minutes to 100-nanoseconds-ticks */ t += (LONGLONG)lBias * 600000000; - LL2FILETIME( t, &ft) + longlong_to_filetime( t, &ft ); return FileTimeToSystemTime(&ft, lpUniversalTime); } @@ -884,8 +889,8 @@ BOOL WINAPI GetProcessTimes( HANDLE hprocess, LPFILETIME lpCreationTime, TIME_ClockTimeToFileTime(tms.tms_stime,lpKernelTime); if (NtQueryInformationProcess( hprocess, ProcessTimes, &pti, sizeof(pti), NULL)) return FALSE; - LL2FILETIME( pti.CreateTime.QuadPart, lpCreationTime); - LL2FILETIME( pti.ExitTime.QuadPart, lpExitTime); + longlong_to_filetime( pti.CreateTime.QuadPart, lpCreationTime ); + longlong_to_filetime( pti.ExitTime.QuadPart, lpExitTime ); return TRUE; }

1 0

Alexandre Julliard : Wine release 4.0.1
by Alexandre Julliard 15 May '19

15 May '19

Module: website Branch: master Commit: de471d6e75f3cdef74950192d65c61a1ac158601 URL: https://source.winehq.org/git/website.git/?a=commit;h=de471d6e75f3cdef74950… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 21:32:31 2019 +0200 Wine release 4.0.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019051501.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2019051501.xml b/news/en/2019051501.xml new file mode 100644 index 0000000..4848b53 --- /dev/null +++ b/news/en/2019051501.xml @@ -0,0 +1,13 @@ +<news> +<date>May 15, 2019</date> +<title>Wine 4.0.1 Released</title> +<body> + The Wine maintenance release 4.0.1 is now available. + <a href="{$root}/announce/4.0.1">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> + <li>Sinhala and Tamil translation updates</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Isira Seneviratne : kernel32: Add the Sinhala NLS file.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 0be34e5a0d7875369aa63dc3a815fa2be6ba7774 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0be34e5a0d7875369aa63dc3… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Feb 28 12:04:01 2019 +0530 kernel32: Add the Sinhala NLS file. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b40c14d8aa9f4aa25b4524bf1dc89a76b54859c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/sin.nls | 170 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 37b20e3..3f9cfd4 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -234,6 +234,8 @@ #include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ +#include "nls/sin.nls" /* 0x045b LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA */ + #include "nls/nep.nls" /* 0x0461 LANG_NEPALI, SUBLANG_NEPALI_NEPAL */ #include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls new file mode 100644 index 0000000..04fe70f --- /dev/null +++ b/dlls/kernel32/nls/sin.nls @@ -0,0 +1,170 @@ +/* + * Locale definitions for Sinhala + * + * Copyright 2019 Isira Seneviratne + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8010\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "94" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "94" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "045B" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "045B" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "උදේ" + LOCALE_S2359 "හවස" + LOCALE_SABBREVCTRYNAME "LK" + LOCALE_SABBREVDAYNAME1 "ස" + LOCALE_SABBREVDAYNAME2 "අ" + LOCALE_SABBREVDAYNAME3 "බ" + LOCALE_SABBREVDAYNAME4 "බ්ර" + LOCALE_SABBREVDAYNAME5 "සි" + LOCALE_SABBREVDAYNAME6 "සෙ" + LOCALE_SABBREVDAYNAME7 "ඉ" + LOCALE_SABBREVLANGNAME "SIN" + LOCALE_SABBREVMONTHNAME1 "ජන." + LOCALE_SABBREVMONTHNAME2 "පෙබ." + LOCALE_SABBREVMONTHNAME3 "මාර්තු" + LOCALE_SABBREVMONTHNAME4 "අප්රේල්" + LOCALE_SABBREVMONTHNAME5 "මැයි" + LOCALE_SABBREVMONTHNAME6 "ජූනි" + LOCALE_SABBREVMONTHNAME7 "ජූලි" + LOCALE_SABBREVMONTHNAME8 "අගෝ." + LOCALE_SABBREVMONTHNAME9 "සැප්." + LOCALE_SABBREVMONTHNAME10 "ඔක්." + LOCALE_SABBREVMONTHNAME11 "නොවැ." + LOCALE_SABBREVMONTHNAME12 "දෙසැ." + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Sri Lanka" + LOCALE_SCURRENCY "රු." + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "සඳුදා" + LOCALE_SDAYNAME2 "අඟහරුවාදා" + LOCALE_SDAYNAME3 "බදාදා" + LOCALE_SDAYNAME4 "බ්‍රහස්පතින්දා" + LOCALE_SDAYNAME5 "සිකුරාදා" + LOCALE_SDAYNAME6 "සෙනසුරාදා" + LOCALE_SDAYNAME7 "ඉරිදා" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Sri Lanka" + LOCALE_SENGCURRNAME "Sri Lankan Rupee" + LOCALE_SENGLANGUAGE "Sinhala" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "LKR" + LOCALE_SISO3166CTRYNAME "LK" + LOCALE_SISO639LANGNAME "si" + LOCALE_SLANGUAGE "Sinhala" + LOCALE_SLIST "," + LOCALE_SLONGDATE "yyyy MMMM dd" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "ජනවාරි" + LOCALE_SMONTHNAME2 "පෙබරවාරි" + LOCALE_SMONTHNAME3 "මාර්තු" + LOCALE_SMONTHNAME4 "අප්රේල්" + LOCALE_SMONTHNAME5 "මැයි" + LOCALE_SMONTHNAME6 "ජූනි" + LOCALE_SMONTHNAME7 "ජූලි" + LOCALE_SMONTHNAME8 "අගෝස්තු" + LOCALE_SMONTHNAME9 "සැප්තැම්බර්" + LOCALE_SMONTHNAME10 "ඔක්තෝබර්" + LOCALE_SMONTHNAME11 "නොවැම්බර්" + LOCALE_SMONTHNAME12 "දෙසැම්බර්" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "si-LK" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "ශ්‍රී ලංකා" + LOCALE_SNATIVECURRNAME "රුපියල" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "සිංහල (ශ්‍රී ලංකා)" + LOCALE_SNATIVELANGNAME "සිංහල" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "SIN " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Taml;" + LOCALE_SPARENT "si" + LOCALE_SSHORTDATE "yyyy/MMMM/dd" + LOCALE_SSHORTESTDAYNAME1 "ස" + LOCALE_SSHORTESTDAYNAME2 "අ" + LOCALE_SSHORTESTDAYNAME3 "බ" + LOCALE_SSHORTESTDAYNAME4 "බ්ර" + LOCALE_SSHORTESTDAYNAME5 "සි" + LOCALE_SSHORTESTDAYNAME6 "සෙ" + LOCALE_SSHORTESTDAYNAME7 "ඉ" + LOCALE_SSHORTTIME "H.mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H.mm:ss" + LOCALE_SYEARMONTH "yyyy MMMM" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

Isira Seneviratne : kernel32: Fix LOCALE_SSCRIPTS value for Sinhala.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 60203f4aad367af06329cda3d1bd7108ab032c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=60203f4aad367af06329cda3… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Mar 1 09:07:45 2019 +0530 kernel32: Fix LOCALE_SSCRIPTS value for Sinhala. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 057df127387eee0fb127f224465cb21419203dea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/sin.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 04fe70f..8a96aa7 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -133,7 +133,7 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "SIN " LOCALE_SPOSITIVESIGN "" - LOCALE_SSCRIPTS "Taml;" + LOCALE_SSCRIPTS "Sinh;" LOCALE_SPARENT "si" LOCALE_SSHORTDATE "yyyy/MMMM/dd" LOCALE_SSHORTESTDAYNAME1 "ස"

1 0

Isira Seneviratne : kernel32/nls: Fix some values in Sinhala NLS file.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: a90112d1785dd76c7de3ecc783baef462010bc3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a90112d1785dd76c7de3ecc7… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Mon Mar 4 04:19:18 2019 +0530 kernel32/nls: Fix some values in Sinhala NLS file. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6ca2001eb36bcad8e09edffce4d18aa73914208) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/sin.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 8a96aa7..36dd281 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -43,11 +43,11 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "045B" - LOCALE_ILDATE "1" + LOCALE_ILDATE "2" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" - LOCALE_INEGCURR "12" + LOCALE_INEGCURR "1" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" LOCALE_INEGSIGNPOSN "4"

1 0

Isira Seneviratne : kernel32/nls: Change Sinhala sublang identifier to SUBLANG_SINHALESE_SRI_LANKA.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: b65f69b3cf9e147be5275c7b44c619d28ae5a8eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b65f69b3cf9e147be5275c7b… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Mar 26 19:56:27 2019 +0530 kernel32/nls: Change Sinhala sublang identifier to SUBLANG_SINHALESE_SRI_LANKA. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eb3988f080b85dce5dae66c5e667724683945c6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/sin.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 36dd281..033dbc0 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -20,7 +20,7 @@ #pragma code_page(65001) /* UTF-8 */ -STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT +STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA { LOCALE_FONTSIGNATURE L"\x002f\x8010\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1"

1 0