November 2019 - Wine-commits

Philip Rebohle : vkd3d: Handle DXGI_FORMAT_R11G11B10_FLOAT in d3d12_command_list_ClearUnorderedAccessViewUint().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: a204a681a1878bee29cc7094b9265ac45d3ad949 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a204a681a1878bee29cc709… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 25 17:53:40 2019 +0330 vkd3d: Handle DXGI_FORMAT_R11G11B10_FLOAT in d3d12_command_list_ClearUnorderedAccessViewUint(). There is no bit-compatible UINT format, so we'll use DXGI_FORMAT_R32_UINT. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 19 ++++++++++++++++++- tests/d3d12.c | 8 ++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e3810e2..75af27d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4979,6 +4979,22 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, } } +static const struct vkd3d_format *vkd3d_fixup_clear_uav_uint_colour(struct d3d12_device *device, + DXGI_FORMAT dxgi_format, VkClearColorValue *colour) +{ + switch (dxgi_format) + { + case DXGI_FORMAT_R11G11B10_FLOAT: + colour->uint32[0] = (colour->uint32[0] & 0x7ff) + | ((colour->uint32[1] & 0x7ff) << 11) + | ((colour->uint32[2] & 0x3ff) << 22); + return vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); + + default: + return NULL; + } +} + static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList1 *iface, D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource, const UINT values[4], UINT rect_count, const D3D12_RECT *rects) @@ -5000,7 +5016,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID if (view->format->type != VKD3D_FORMAT_TYPE_UINT) { - if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format))) + if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format)) + && !(uint_format = vkd3d_fixup_clear_uav_uint_colour(device, view->format->dxgi_format, &colour))) { ERR("Unhandled format %#x.\n", view->format->dxgi_format); return; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5d549e2..52de007 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4839,11 +4839,11 @@ static void test_clear_unordered_access_view_buffer(void) {0x100, 0, 0, 0}, 0, false, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0, 0, 0, 0}, 0, false, true}, + {0, 0, 0, 0}, 0}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff, false, true}, + {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x7ff, 0, 0x3ff, 0}, 0xffc007ff, false, true}, + {0x7ff, 0, 0x3ff, 0}, 0xffc007ff}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0}, 0x801e0380, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, @@ -5011,7 +5011,7 @@ static void test_clear_unordered_access_view_image(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, - {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001, false, true}, + {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true},

1 0

Conor McCarthy : vkd3d: Add tests for external resource heap properties.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: 5366d405e9c3da30baef92f235721c872c856aa1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5366d405e9c3da30baef92f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 25 17:53:41 2019 +0330 vkd3d: Add tests for external resource heap properties. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/vkd3d_api.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index a9a7fc1..135782d 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -854,7 +854,9 @@ static VkDeviceMemory allocate_vulkan_image_memory(ID3D12Device *device, static void test_external_resource_map(void) { struct vkd3d_image_resource_create_info resource_create_info; + D3D12_HEAP_PROPERTIES heap_properties; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + D3D12_HEAP_FLAGS heap_flags; ID3D12Resource *vk_resource; VkDeviceMemory vk_memory; ID3D12Device *device; @@ -898,6 +900,16 @@ static void test_external_resource_map(void) gpu_address = ID3D12Resource_GetGPUVirtualAddress(vk_resource); ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + hr = ID3D12Resource_GetHeapProperties(vk_resource, &heap_properties, &heap_flags); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(heap_properties.Type == D3D12_HEAP_TYPE_DEFAULT, "Got unexpected heap type %#x.\n", heap_properties.Type); + ok(heap_properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_UNKNOWN, + "Got unexpected CPU page property %#x.\n", heap_properties.CPUPageProperty); + ok(heap_properties.MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN, + "Got unexpected memory pool preference %#x.\n", heap_properties.MemoryPoolPreference); + todo ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); + todo ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); + ID3D12Resource_Release(vk_resource); vk_device = vkd3d_get_vk_device(device); vkDestroyImage(vk_device, vk_image, NULL);

1 0

Conor McCarthy : vkd3d: Return valid node masks in external resource heap properties.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: vkd3d Branch: master Commit: e783784cace2fb2af7d9fb9fe3d8a1af07a8c8a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e783784cace2fb2af7d9fb9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 25 17:53:42 2019 +0330 vkd3d: Return valid node masks in external resource heap properties. Hitman 2 calls GetHeapProperties() for each swapchain buffer and checks if the creation node mask is 1. If not then it fails to store the resource pointers for later rendering. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 2 ++ tests/vkd3d_api.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 89733ce..f5cdf4a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1522,6 +1522,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetHeapProperties(ID3D12Resource { memset(heap_properties, 0, sizeof(*heap_properties)); heap_properties->Type = D3D12_HEAP_TYPE_DEFAULT; + heap_properties->CreationNodeMask = 1; + heap_properties->VisibleNodeMask = 1; } if (flags) *flags = D3D12_HEAP_FLAG_NONE; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 135782d..d4fe79a 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -907,8 +907,8 @@ static void test_external_resource_map(void) "Got unexpected CPU page property %#x.\n", heap_properties.CPUPageProperty); ok(heap_properties.MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN, "Got unexpected memory pool preference %#x.\n", heap_properties.MemoryPoolPreference); - todo ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); - todo ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); + ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); + ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); ID3D12Resource_Release(vk_resource); vk_device = vkd3d_get_vk_device(device);

1 0

Francois Gouget : testbot: Give a higher priority to wine VMs.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: tools Branch: master Commit: 7d05cb40e47f0e98d5897cfc38b37039c6916e18 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7d05cb40e47f0e98d5897cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 22 15:54:18 2019 +0100 testbot: Give a higher priority to wine VMs. They are needed for patches that don't impact the Windows tests and thus are more likely to be needed next than Windows VMs. The build VMs should still remain in the top spot because delaying their tasks delays all the corresponding Windows tasks, which would leave the TestBot partially idle. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index b6a8998..c28e143 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -411,9 +411,9 @@ sub _CheckAndClassifyVMs() $VM->Role eq "winetest" ? 10 : 20) + # extra ($VM->Type eq "build" ? 0 : - $VM->Type eq "win64" ? 1 : - $VM->Type eq "win32" ? 2 : - 3); # wine + $VM->Type eq "wine" ? 1 : + $VM->Type eq "win64" ? 2 : + 3); # win32 } # If a VM was in an inconsistent state, update the jobs status fields before

1 0

Alexandre Julliard : Wine release 4.0.3
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: website Branch: master Commit: e46fd827eeaa22867f68dffc92f34ed5f0602781 URL: https://source.winehq.org/git/website.git/?a=commit;h=e46fd827eeaa22867f68d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 16:12:37 2019 +0100 Wine release 4.0.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019112501.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2019112501.xml b/news/en/2019112501.xml new file mode 100644 index 00000000..82c394b4 --- /dev/null +++ b/news/en/2019112501.xml @@ -0,0 +1,13 @@ +<news> +<date>November 25, 2019</date> +<title>Wine 4.0.3 Released</title> +<body> + The Wine maintenance release 4.0.3 is now available. + <a href="{$root}/announce/4.0.3">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> + <li>Updates to the National Language Support files</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0.3.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

Michael Stefaniuc : Release 4.0.3.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: ab71182fbe93e9f01db7ffbc8f3e2f86cadd4344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab71182fbe93e9f01db7ffbc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Nov 16 22:18:20 2019 +0100 Release 4.0.3. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 491 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 7 + VERSION | 2 +- configure | 18 +-- 4 files changed, 290 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab71182fbe93e9f01db7…

1 0

Tag wine-4.0.3 : Alexandre Julliard : Release 4.0.3
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: refs/tags/wine-4.0.3 Tag: 42379f92778237b32f63f4cb3355d8d10eb85d78 URL: https://source.winehq.org/git/wine.git/?a=tag;h=42379f92778237b32f63f4cb335… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 16:10:40 2019 +0100 Release 4.0.3

1 0

Enol Puente : wrc: Add Asturian locale.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 113f49c38eb93f93e64b09c1755968f0585c9acd URL: https://source.winehq.org/git/wine.git/?a=commit;h=113f49c38eb93f93e64b09c1… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:34 2019 -0600 wrc: Add Asturian locale. Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ec3181633b0e5d2d2b66cab711eacc6241c2597a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/winnt.rh | 1 + tools/wrc/po.c | 2 ++ tools/wrc/utils.c | 1 + 3 files changed, 4 insertions(+) diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1d96..59791bc996 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 diff --git a/tools/wrc/po.c b/tools/wrc/po.c index c58c062cbb..5774546dfa 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -239,6 +239,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ(a)latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ(a)cyrillic" }, diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 633ec57d86..1369a1ee71 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -426,6 +426,7 @@ static const struct lang2cp lang2cps[] = { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 },

1 0

Enol Puente : wmc: Support Asturian.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 62edbf66246a3a0bd259fd21266b996190ce3ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62edbf66246a3a0bd259fd21… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:34 2019 -0600 wmc: Support Asturian. Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit af5f7a8785ccde66b628c683406c78cbbf83a065) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/wmc/po.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 6986bc9cee..bd12a285ef 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -82,6 +82,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ(a)latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ(a)cyrillic" },

1 0

Enol Puente : kernel32: Add Asturian locale.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 01d16cc01ab6034e04c473a99640b1225cadff4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d16cc01ab6034e04c473a9… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:35 2019 -0600 kernel32: Add Asturian locale. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ff8dcba46648364fa6b342969c66de6007451e69) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ast.nls | 171 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 3f9cfd46d4..c6bb407b1c 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -256,4 +256,6 @@ #include "nls/gdv.nls" /* 0x0494 LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */ +#include "nls/ast.nls" /* 0x04a5 LANG_ASTURIAN, SUBLANG_DEFAULT */ + #include "nls/ivl.nls" /* 0x047f LANG_INVARIANT, SUBLANG_NEUTRAL */ diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls new file mode 100644 index 0000000000..a990295f6c --- /dev/null +++ b/dlls/kernel32/nls/ast.nls @@ -0,0 +1,171 @@ +/* + * Locale definitions for Asturian + * + * Copyright 2019 Enol Puente for Softastur + * + * 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_ASTURIAN, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "34" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "34" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "04a5" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "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 "0" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "ESP" + LOCALE_SABBREVDAYNAME1 "Llu" + LOCALE_SABBREVDAYNAME2 "Mar" + LOCALE_SABBREVDAYNAME3 "Mie" + LOCALE_SABBREVDAYNAME4 "Xue" + LOCALE_SABBREVDAYNAME5 "Vie" + LOCALE_SABBREVDAYNAME6 "Sáb" + LOCALE_SABBREVDAYNAME7 "Dom" + LOCALE_SABBREVLANGNAME "AST" + LOCALE_SABBREVMONTHNAME1 "Xin" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Abr" + LOCALE_SABBREVMONTHNAME5 "May" + LOCALE_SABBREVMONTHNAME6 "Xun" + LOCALE_SABBREVMONTHNAME7 "Xnt" + LOCALE_SABBREVMONTHNAME8 "Ago" + LOCALE_SABBREVMONTHNAME9 "Set" + LOCALE_SABBREVMONTHNAME10 "Och" + LOCALE_SABBREVMONTHNAME11 "Pay" + LOCALE_SABBREVMONTHNAME12 "Avi" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Spain" + LOCALE_SCURRENCY "€" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Llunes" + LOCALE_SDAYNAME2 "Martes" + LOCALE_SDAYNAME3 "Miércoles" + LOCALE_SDAYNAME4 "Xueves" + LOCALE_SDAYNAME5 "Vienres" + LOCALE_SDAYNAME6 "Sábadu" + LOCALE_SDAYNAME7 "Domingu" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Spain" + LOCALE_SENGCURRNAME "Euro" + LOCALE_SENGLANGUAGE "Asturian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "EUR" + LOCALE_SISO3166CTRYNAME "ES" + LOCALE_SISO639LANGNAME "ast" + LOCALE_SLANGUAGE "Asturian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "Xineru" + LOCALE_SMONTHNAME2 "Febreru" + LOCALE_SMONTHNAME3 "Marzu" + LOCALE_SMONTHNAME4 "Abril" + LOCALE_SMONTHNAME5 "Mayu" + LOCALE_SMONTHNAME6 "Xunu" + LOCALE_SMONTHNAME7 "Xunetu" + LOCALE_SMONTHNAME8 "Agostu" + LOCALE_SMONTHNAME9 "Setiembre" + LOCALE_SMONTHNAME10 "Ochobre" + LOCALE_SMONTHNAME11 "Payares" + LOCALE_SMONTHNAME12 "Avientu" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNAME "ast-ES" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "España" + LOCALE_SNATIVECURRNAME "Euru" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Asturianu" + LOCALE_SNATIVELANGNAME "Asturianu" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "AST " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "ast" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "Ll" + LOCALE_SSHORTESTDAYNAME2 "Ma" + LOCALE_SSHORTESTDAYNAME3 "Mi" + LOCALE_SSHORTESTDAYNAME4 "Xu" + LOCALE_SSHORTESTDAYNAME5 "Vi" + LOCALE_SSHORTESTDAYNAME6 "Sá" + LOCALE_SSHORTESTDAYNAME7 "Do" + LOCALE_SSHORTTIME "HH:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH: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