February 2021 - Wine-Commits

Zebediah Figura : kernelbase: Map LANG_SERBIAN_NEUTRAL in ConvertDefaultLocale().
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: f51e44c1802338cdd41b38efe2757b642b619d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51e44c1802338cdd41b38ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 3 17:48:34 2021 -0600 kernelbase: Map LANG_SERBIAN_NEUTRAL in ConvertDefaultLocale(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 ++++ dlls/kernelbase/locale.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3fdfa251144..0f409abe3e2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3652,6 +3652,10 @@ static void test_ConvertDefaultLocale(void) broken( lcid == 0x7c04 ) || /* winxp */ broken( lcid == 0x0404 ), /* vista */ "Expected lcid = %08x got %08x\n", MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ), lcid ); + lcid = ConvertDefaultLocale( LANG_SERBIAN_NEUTRAL ); + ok( lcid == MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN ) || + broken( lcid == MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_LATIN ) ), /* <= vista */ + "Expected lcid = %08x got %08x\n", MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN ), lcid ); /* Invariant language is not treated specially */ TEST_LCID(LANG_INVARIANT, SUBLANG_DEFAULT, SORT_DEFAULT); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c60b796aa48..d2f71c97ac7 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3189,6 +3189,8 @@ LCID WINAPI DECLSPEC_HOTPATCH ConvertDefaultLocale( LCID lcid ) return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); case MAKELANGID( LANG_CHINESE, 0x1f ): return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ); + case LANG_SERBIAN_NEUTRAL: + return MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN ); case MAKELANGID( LANG_SPANISH, SUBLANG_NEUTRAL ): return MAKELANGID( LANG_SPANISH, SUBLANG_SPANISH_MODERN ); case MAKELANGID( LANG_IRISH, SUBLANG_NEUTRAL ):

1 0

Alexandre Julliard : ntdll/tests: Fix a couple of test failures on older Windows versions.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 85c52b397ac203c8cdc1e32222c52d1e52314eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=85c52b397ac203c8cdc1e322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 14:04:35 2021 +0100 ntdll/tests: Fix a couple of test failures on older Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1673686bddf..5d7673deffe 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1740,7 +1740,8 @@ static void test_query_process_image_info(void) ok( info.MinorSubsystemVersion == nt->OptionalHeader.MinorSubsystemVersion, "wrong minor version %x/%x\n", info.MinorSubsystemVersion, nt->OptionalHeader.MinorSubsystemVersion ); - ok( info.MajorOperatingSystemVersion == nt->OptionalHeader.MajorOperatingSystemVersion, + ok( info.MajorOperatingSystemVersion == nt->OptionalHeader.MajorOperatingSystemVersion || + broken( !info.MajorOperatingSystemVersion ), /* <= win8 */ "wrong major OS version %x/%x\n", info.MajorOperatingSystemVersion, nt->OptionalHeader.MajorOperatingSystemVersion ); ok( info.MinorOperatingSystemVersion == nt->OptionalHeader.MinorOperatingSystemVersion, @@ -2752,7 +2753,8 @@ static void test_wow64(void) } #endif ok( !NtCurrentTeb()->GdiBatchCount, "GdiBatchCount set to %x\n", NtCurrentTeb()->GdiBatchCount ); - ok( !NtCurrentTeb()->WowTebOffset, "WowTebOffset set to %x\n", NtCurrentTeb()->WowTebOffset ); + ok( !NtCurrentTeb()->WowTebOffset || broken( NtCurrentTeb()->WowTebOffset == 1 ), /* vista */ + "WowTebOffset set to %x\n", NtCurrentTeb()->WowTebOffset ); } static void test_debug_object(void)

1 0

Nikolay Sivov : dwrite: Change remaining traces to have consistent format.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 4914f51c096dc6d19f9c4c3fdecb0b17b3ed1008 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4914f51c096dc6d19f9c4c3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 4 13:19:46 2021 +0300 dwrite: Change remaining traces to have consistent format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 50 ++++++++++++++++++++++--------------------- dlls/dwrite/font.c | 58 ++++++++++++++++++++++++-------------------------- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/main.c | 2 +- dlls/dwrite/opentype.c | 2 +- 5 files changed, 58 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4914f51c096dc6d19f9c…

1 0

Alistair Leslie-Hughes : include: Add mulres.idl.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 578f857d4ad2ad028e7ae8b997e879411f28c3be URL: https://source.winehq.org/git/wine.git/?a=commit;h=578f857d4ad2ad028e7ae8b9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:16 2021 +1100 include: Add mulres.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/mulres.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 63 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 917395b37bd..a71dbd5f5a5 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1630,6 +1630,20 @@ HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, return E_NOTIMPL; } +HRESULT __RPC_STUB IMultipleResults_GetResult_Stub(IMultipleResults* This, IUnknown *outer, + DBRESULTFLAG result, REFIID riid, DBROWCOUNT *affected, IUnknown **rowset, IErrorInfo **error) +{ + FIXME("(%p)->(%p %ld %s %p %p %p): stub\n", This, outer, result, debugstr_guid(riid), affected, rowset, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK IMultipleResults_GetResult_Proxy(IMultipleResults* This, IUnknown *outer, + DBRESULTFLAG result, REFIID riid, DBROWCOUNT *affected, IUnknown **rowset) +{ + FIXME("(%p)->(%p %ld %s %p %p): stub\n", This, outer, result, debugstr_guid(riid), affected, rowset); + return E_NOTIMPL; +} + HRESULT CALLBACK ICommandPrepare_Prepare_Proxy(ICommandPrepare* This, ULONG runs) { FIXME("(%p)->(%d): stub\n", This, runs); diff --git a/include/Makefile.in b/include/Makefile.in index 5de2a0e3a4f..f99280149fd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -509,6 +509,7 @@ SOURCES = \ msxml6did.h \ msxmldid.h \ mtxdm.h \ + mulres.idl \ multimon.h \ natupnp.idl \ nb30.h \ diff --git a/include/mulres.idl b/include/mulres.idl new file mode 100644 index 00000000000..d7bda98b9bf --- /dev/null +++ b/include/mulres.idl @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a90-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IMultipleResults : IUnknown +{ + typedef DB_LRESERVE DBRESULTFLAG; + + enum DBRESULTFLAGENUM + { + DBRESULTFLAG_DEFAULT = 0, + DBRESULTFLAG_ROWSET = 1, + DBRESULTFLAG_ROW = 2, + }; + + [local] + HRESULT GetResult([in] IUnknown *outer, [in] DBRESULTFLAG result, [in] REFIID riid, [out] DBROWCOUNT *affected, + [out, iid_is(riid), annotation("_Outptr_opt_result_maybenull_")] IUnknown ** rowset); + + [call_as(GetResult)] + HRESULT RemoteGetResult([in] IUnknown *outer, [in] DBRESULTFLAG result, [in] REFIID riid, + [in, out, unique] DBROWCOUNT *affected, [in, out, unique, iid_is(riid)] IUnknown **rowset, + [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 4e333353a5e..475eb85642e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -77,6 +77,7 @@ typedef LONG_PTR DB_LRESERVE; #include "cmdpre.idl" #include "rstchg.idl" #include "rstupd.idl" +#include "mulres.idl" cpp_quote("#include <accctrl.h>")

1 0

Alexandre Julliard : server: Add a data type for generic access mappings.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 928a22cd025abadb084f0308df32ac29442b723d URL: https://source.winehq.org/git/wine.git/?a=commit;h=928a22cd025abadb084f0308… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 13:21:49 2021 +0100 server: Add a data type for generic access mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/security.c | 8 ++++---- include/wine/server_protocol.h | 15 ++++++++++----- server/protocol.def | 13 +++++++++---- server/request.h | 6 ++---- server/token.c | 40 ++++++++++++++++------------------------ server/trace.c | 11 +++++++---- tools/make_requests | 1 + 7 files changed, 49 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=928a22cd025abadb084f…

1 0

Alexandre Julliard : server: Add support for object counts in the object type information.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: dc4e88183499cca1e32a2d95a842b941b3c1af1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc4e88183499cca1e32a2d95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 14:08:23 2021 +0100 server: Add support for object counts in the object type information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 48 +++++++++++++++++++++--------------------- include/wine/server_protocol.h | 17 +++++++++++---- include/winternl.h | 23 +++++++++++++++++++- server/directory.c | 18 ++++++++++++++-- server/handle.c | 3 +++ server/object.c | 3 +++ server/object.h | 4 ++++ server/protocol.def | 14 ++++++++++-- server/request.h | 3 +-- server/trace.c | 26 +++++++++++++++++++++-- 10 files changed, 122 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc4e88183499cca1e32a…

1 0

Nikolay Sivov : mfplat/tests: Fix a crash on Vista.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 9ec297e283d5f914dcf70c81cfaf3e3c77675381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec297e283d5f914dcf70c81… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 4 12:49:15 2021 +0300 mfplat/tests: Fix a crash on Vista. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index deb9e78efba..0464293b37f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -136,6 +136,7 @@ static DXGI_FORMAT (WINAPI *pMFMapDX9FormatToDXGIFormat)(DWORD format); static HRESULT (WINAPI *pMFCreateVideoSampleAllocatorEx)(REFIID riid, void **allocator); static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreateVideoMediaTypeFromSubtype)(const GUID *subtype, IMFVideoMediaType **media_type); static HWND create_window(void) { @@ -799,6 +800,7 @@ static void init_functions(void) X(MFCreateMFByteStreamOnStream); X(MFCreateTrackedSample); X(MFCreateTransformActivate); + X(MFCreateVideoMediaTypeFromSubtype); X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); @@ -965,28 +967,32 @@ if(0) IUnknown_Release(unk2); IUnknown_Release(unk); + IMFMediaType_Release(mediatype); - hr = MFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB555, &video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - - check_interface(video_type, &IID_IMFMediaType, TRUE); - check_interface(video_type, &IID_IMFVideoMediaType, TRUE); + if (pMFCreateVideoMediaTypeFromSubtype) + { + hr = pMFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB555, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Major and subtype are set on creation. */ - hr = IMFVideoMediaType_GetCount(video_type, &count); - ok(count == 2, "Unexpected attribute count %#x.\n", hr); + check_interface(video_type, &IID_IMFMediaType, TRUE); + check_interface(video_type, &IID_IMFVideoMediaType, TRUE); - hr = IMFVideoMediaType_DeleteAllItems(video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Major and subtype are set on creation. */ + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(count == 2, "Unexpected attribute count %#x.\n", hr); - hr = IMFVideoMediaType_GetCount(video_type, &count); - ok(!count, "Unexpected attribute count %#x.\n", hr); + hr = IMFVideoMediaType_DeleteAllItems(video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - check_interface(video_type, &IID_IMFVideoMediaType, FALSE); + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(!count, "Unexpected attribute count %#x.\n", hr); - IMFVideoMediaType_Release(video_type); + check_interface(video_type, &IID_IMFVideoMediaType, FALSE); - IMFMediaType_Release(mediatype); + IMFVideoMediaType_Release(video_type); + } + else + win_skip("MFCreateVideoMediaTypeFromSubtype() is not available.\n"); /* IMFAudioMediaType */ hr = MFCreateMediaType(&mediatype);

1 0

Timothy Pearson : include: Add PPC64 endianness.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: 3017cc0f15d8211fdbdd124eeff7ccd34f3d3038 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3017cc0f15d8211fdbdd124e… Author: Timothy Pearson <tpearson(a)raptorengineering.com> Date: Sun Jan 31 18:34:11 2021 +0100 include: Add PPC64 endianness. Signed-off-by: Timothy Pearson <tpearson(a)raptorengineering.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetsd.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/basetsd.h b/include/basetsd.h index 7087b592d1a..761af4d5214 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -275,6 +275,10 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # undef WORDS_BIGENDIAN #elif defined(__x86_64__) # undef WORDS_BIGENDIAN +#elif defined(__powerpc64__) && defined(__BIG_ENDIAN__) +# define WORDS_BIGENDIAN +#elif defined(__powerpc64__) +# undef WORDS_BIGENDIAN #elif defined(__powerpc__) # define WORDS_BIGENDIAN #elif defined(__ALPHA__)

1 0

Alexandre Julliard : server: Add a type descriptor to all server objects.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: c6f2aacb5761801a17b930086111f4b2c4a30075 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f2aacb5761801a17b93008… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 13:44:18 2021 +0100 server: Add a type descriptor to all server objects. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 4 +- server/atom.c | 2 +- server/change.c | 10 +---- server/clipboard.c | 2 +- server/completion.c | 17 ++++----- server/console.c | 22 ++++------- server/debugger.c | 19 +++++----- server/device.c | 23 ++++++----- server/directory.c | 107 +++++++++++++++++++++++++++++++--------------------- server/event.c | 34 ++++++++--------- server/fd.c | 8 ++-- server/file.c | 16 ++++---- server/file.h | 1 - server/handle.c | 2 +- server/hook.c | 2 +- server/mailslot.c | 16 ++------ server/mapping.c | 22 +++++------ server/mutex.c | 17 ++++----- server/named_pipe.c | 18 +++------ server/object.c | 7 +--- server/object.h | 36 ++++++++++++++++-- server/process.c | 38 +++++++++---------- server/queue.c | 4 +- server/registry.c | 17 ++++----- server/request.c | 2 +- server/semaphore.c | 17 ++++----- server/serial.c | 2 +- server/signal.c | 2 +- server/sock.c | 14 ++----- server/symlink.c | 17 ++++----- server/thread.c | 21 +++++------ server/timer.c | 17 ++++----- server/token.c | 17 ++++----- server/winstation.c | 34 ++++++++--------- 34 files changed, 287 insertions(+), 300 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6f2aacb5761801a17b9…

1 0

Michael Müller : kernel32: Add sr-Latn-RS locale definition.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: wine Branch: master Commit: db2666e9d20f80968ff6b4b0ea1deae20c3c368b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db2666e9d20f80968ff6b4b0… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 3 17:48:33 2021 -0600 kernel32: Add sr-Latn-RS locale definition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 1 + dlls/kernel32/nls/srm.nls | 174 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index c6bb407b1c5..86ababd0900 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -143,6 +143,7 @@ #include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */ #include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */ #include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */ +#include "nls/srm.nls" /* 0x241a LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN */ #include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/srm.nls b/dlls/kernel32/nls/srm.nls new file mode 100644 index 00000000000..f4b1169943a --- /dev/null +++ b/dlls/kernel32/nls/srm.nls @@ -0,0 +1,174 @@ +/* + * Locale definitions for Serbian (Serbia, Latin) + * + * Copyright 2016 Michael Müller + * + * 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_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN +{ + LOCALE_FONTSIGNATURE L"\x0027\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x0400\x0012\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "381" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "1250" + LOCALE_IDEFAULTCODEPAGE "852" + LOCALE_IDEFAULTCOUNTRY "381" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "241a" + LOCALE_IDEFAULTMACCODEPAGE "10029" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "271" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "241a" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGATIVEPERCENT "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "pre podne" + LOCALE_S2359 "po podne" + LOCALE_SABBREVCTRYNAME "SRB" + LOCALE_SABBREVDAYNAME1 "pon" + LOCALE_SABBREVDAYNAME2 "uto" + LOCALE_SABBREVDAYNAME3 "sre" + LOCALE_SABBREVDAYNAME4 "čet" + LOCALE_SABBREVDAYNAME5 "pet" + LOCALE_SABBREVDAYNAME6 "sub" + LOCALE_SABBREVDAYNAME7 "ned" + LOCALE_SABBREVLANGNAME "SRM" + LOCALE_SABBREVMONTHNAME1 "jan" + LOCALE_SABBREVMONTHNAME2 "feb" + LOCALE_SABBREVMONTHNAME3 "mar" + LOCALE_SABBREVMONTHNAME4 "apr" + LOCALE_SABBREVMONTHNAME5 "maj" + LOCALE_SABBREVMONTHNAME6 "jun" + LOCALE_SABBREVMONTHNAME7 "jul" + LOCALE_SABBREVMONTHNAME8 "avg" + LOCALE_SABBREVMONTHNAME9 "sep" + LOCALE_SABBREVMONTHNAME10 "okt" + LOCALE_SABBREVMONTHNAME11 "nov" + LOCALE_SABBREVMONTHNAME12 "dec" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Serbia" + LOCALE_SCURRENCY "Din." + LOCALE_SDATE "." + LOCALE_SDAYNAME1 "ponedeljak" + LOCALE_SDAYNAME2 "utorak" + LOCALE_SDAYNAME3 "sreda" + LOCALE_SDAYNAME4 "četvrtak" + LOCALE_SDAYNAME5 "petak" + LOCALE_SDAYNAME6 "subota" + LOCALE_SDAYNAME7 "nedelja" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Serbia" + LOCALE_SENGCURRNAME "Serbian Dinar" + LOCALE_SENGLANGUAGE "Serbian (Latin)" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "RSD" + LOCALE_SISO3166CTRYNAME "RS" + LOCALE_SISO639LANGNAME "sr" + LOCALE_SLANGUAGE "Serbian (Latin, Serbia)" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, dd. MMMM yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" + LOCALE_SMONTHNAME1 "januar" + LOCALE_SMONTHNAME2 "februar" + LOCALE_SMONTHNAME3 "mart" + LOCALE_SMONTHNAME4 "april" + LOCALE_SMONTHNAME5 "maj" + LOCALE_SMONTHNAME6 "jun" + LOCALE_SMONTHNAME7 "jul" + LOCALE_SMONTHNAME8 "avgust" + LOCALE_SMONTHNAME9 "septembar" + LOCALE_SMONTHNAME10 "oktobar" + LOCALE_SMONTHNAME11 "novembar" + LOCALE_SMONTHNAME12 "decembar" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNAME "sr-Latn-RS" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "Srbija" + LOCALE_SNATIVECURRNAME "Srpski dinar" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)" + LOCALE_SNATIVELANGNAME "srpski" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "SRB " + LOCALE_SPARENT "sr-Latn" + LOCALE_SPOSINFINITY L"\x221e" + LOCALE_SPOSITIVESIGN "+" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "d.M.yyyy" + LOCALE_SSHORTESTDAYNAME1 "pon" + LOCALE_SSHORTESTDAYNAME2 "uto" + LOCALE_SSHORTESTDAYNAME3 "sre" + LOCALE_SSHORTESTDAYNAME4 "čet" + LOCALE_SSHORTESTDAYNAME5 "pet" + LOCALE_SSHORTESTDAYNAME6 "sub" + LOCALE_SSHORTESTDAYNAME7 "ned" + LOCALE_SSHORTTIME "H:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + 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