- wine-devel - winehq.org

[PATCH 1/4] ntoskrnl.exe/tests: Add more NtOpenThread tests.
by Jacek Caban 23 Apr '19

23 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/thread.c | 2 +- dlls/ntdll/tests/info.c | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-)

2 1

[PATCH] mscoree: Update Wine Mono to 4.8.3.
by Vincent Povirk 23 Apr '19

23 Apr '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 143931b3733..ed9ae3a4d2e 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.8.1" -#define MONO_SHA "4e073038c14c2496246ecb044ef8abfb8a1cfede58aa35168e04d484a003b032" +#define MONO_VERSION "4.8.3" +#define MONO_SHA "d6fa1f019bfa3c572438e4a2473ce25af1e937ed4cdcbe46554164ce25db0a76" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 3a3631e708a..8311db7684e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.8.1" +#define WINE_MONO_VERSION "4.8.3" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.17.1

1 0

[PATCH 3/4] ntoskrnl.exe: Add MmUnmapLockedPages stub.
by Jacek Caban 23 Apr '19

23 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 2 +- include/ddk/wdm.h | 1 + 4 files changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH 4/5] dxgi/tests: Add factory window association tests.
by Zhiyi Zhang 23 Apr '19

23 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/dxgi.c | 233 +++++++++++++++++++++++++++++++++++- 2 files changed, 233 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 1c99d70957..fbce9d3dd0 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = d3d10_1 dxgi user32 +IMPORTS = d3d10_1 d3d11 dxgi user32 C_SRCS = \ dxgi.c diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0c15..fe3a2596e0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -40,9 +40,16 @@ static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; +struct device_desc +{ + const D3D_FEATURE_LEVEL *feature_level; + UINT flags; +}; + static struct test_entry { void (*test)(void); @@ -539,6 +546,56 @@ success: return dxgi_device; } +static ID3D11Device *create_d3d11_device(const struct device_desc *desc) +{ + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + const D3D_FEATURE_LEVEL *feature_level; + UINT flags = desc ? desc->flags : 0; + unsigned int feature_level_count; + IDXGIAdapter *adapter; + ID3D11Device *device; + HRESULT hr; + + if (desc && desc->feature_level) + { + feature_level = desc->feature_level; + feature_level_count = 1; + } + else + { + feature_level = default_feature_level; + feature_level_count = ARRAY_SIZE(default_feature_level); + } + + if (enable_debug_layer) + flags |= D3D11_CREATE_DEVICE_DEBUG; + + if ((adapter = create_adapter())) + { + hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL); + IDXGIAdapter_Release(adapter); + return SUCCEEDED(hr) ? device : NULL; + } + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + + return NULL; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -4985,6 +5042,180 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_window_association(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGIFactory *factory, *factory2; + IDXGIDevice *devices[2] = {0}; + ID3D11Device *d3d11_device; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + HWND hwnd, hwnd2; + BOOL fullscreen; + ULONG refcount; + HRESULT hr; + INT i, j; + + static const struct + { + UINT flag; + BOOL expect_fullscreen; + BOOL broken_d3d10; + } + tests[] = + { + /* There are two reasons why VK_TAB and VK_ESC are not tested here. + * 1. Posting them to the window doesn't exit fullscreen like Alt+Enter does. + * Alt+Tab and Alt+Esc are handled somewhere else, e.g., not calling IDXGISwapChain::Present + * will break Alt+Tab and Alt+Esc while Alt+Enter will still function. + * 2. Posting them hangs the posting thread. Another thread keep sending input is needed to avoid the hang. + * The hang is not because of flush_events. */ + {0, TRUE}, + {0, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, + {0, TRUE}, + {0, FALSE} + }; + + /* d3d10 */ + devices[0] = create_device(0); + + /* d3d11 */ + d3d11_device = create_d3d11_device(NULL); + if (d3d11_device) + { + hr = ID3D11Device_QueryInterface(d3d11_device, &IID_IDXGIDevice, (void **)&devices[1]); + ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice\n"); + ID3D11Device_Release(d3d11_device); + } + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hwnd2 = CreateWindowA("static", "dxgi_test2", 0, 0, 0, 400, 200, 0, 0, 0, 0); + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(devices); i++) + { + if (!devices[i]) + { + skip("Create device failed. Skipping IDXGIFactory window association test.\n"); + continue; + } + + hr = IDXGIDevice_GetAdapter(devices[i], &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + + /* Parameter check */ + hr = IDXGIFactory_GetWindowAssociation(factory, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "GetWindowAssociation failed, hr %#x.\n", hr); + + for (j = 0; j <= DXGI_MWA_VALID; j++) + { + hr = IDXGIFactory_MakeWindowAssociation(factory, NULL, j); + ok(SUCCEEDED(hr), "MakeWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, j); + ok(SUCCEEDED(hr), "MakeWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + + hwnd = (HWND)0xdeadbeef; + hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); + ok(SUCCEEDED(hr), "GetWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + /* Yes, GetWindowAssociation always return NULL for hwnd even though MakeWindowAssociation and + * GetWindowAssociation are successfully called. I wonder why. */ + ok(!hwnd, "Expect null associated window.\n"); + } + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "MakeWindowAssociation succeeded, hr %#x.\n", hr); + + /* Alt+Enter tests */ + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)devices[i], &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "SetFullscreenState failed, hr %#x.\n", hr); + if (FAILED(hr)) + skip("Could not change fullscreen state.\n"); + else + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < ARRAY_SIZE(tests); j++) + { + /* Associate a window first with opposite flags */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Associate current test window */ + hwnd = tests[j].flag ? swapchain_desc.OutputWindow : NULL; + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd, tests[j].flag); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Associate a new test window doesn't override old window */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Wrong factory doesn't affect current test window */ + hr = IDXGIFactory_MakeWindowAssociation(factory2, hwnd, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Post synthesized Alt + VK_RETURN WM_SYSKEYDOWN */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(SUCCEEDED(hr), "Test %d: GetFullscreenState failed, hr %#x.\n", j, hr); + ok(fullscreen == tests[j].expect_fullscreen || broken(tests[j].broken_d3d10 && i == 0 && fullscreen), + "Test %d: got unexpected fullscreen %#x.\n", j, fullscreen); + } + } + + /* Set to windowed mode before releasing resources, otherwise there might be unhandled exceptions */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + refcount = IDXGIDevice_Release(devices[i]); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIAdapter_Release(adapter); + ok(!refcount, "IDXGIAdapter has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + } + + refcount = IDXGIFactory_Release(factory2); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(hwnd2); + DestroyWindow(swapchain_desc.OutputWindow); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5029,7 +5260,6 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { HMODULE dxgi_module, d3d12_module; - BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; char **argv; @@ -5084,6 +5314,7 @@ START_TEST(dxgi) test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); + test_window_association(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); -- 2.20.1

2 1

[PATCH resend 1/6] user32/focus: Prevent a recursive loop with the activation messages
by Gabriel Ivăncescu 23 Apr '19

23 Apr '19

When activating a window and sending activation messages to the window procedure, we have to avoid a recursive loop by not sending more of these messages or hooks while we are still activating the window. Some applications actually depend on this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Can someone please take a look at these patches and provide feedback if possible? The behavior is very consistent and the tests are pretty much reliable as far as I can see, so it is indeed Windows' behavior on which apps do rely on (since it fixes an annoying issue in Total Commander's Multi-rename function). I understand it touches a sensitive part of Wine, but I think the tests are pretty conclusive. If not, I'd like some feedback on how to solve it better. Of course, I've been running with this patch for some months now and didn't find anything wrong with focus. dlls/user32/focus.c | 44 +++++++++++++++++++++++++++++--------------- dlls/user32/win.h | 1 + 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f1c8831..0d32d00 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -78,7 +78,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) { HWND previous = GetActiveWindow(); BOOL ret; - DWORD old_thread, new_thread; + DWORD winflags, old_thread, new_thread; CBTACTIVATESTRUCT cbt; if (previous == hwnd) @@ -87,16 +87,24 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) return TRUE; } - /* call CBT hook chain */ - cbt.fMouse = mouse; - cbt.hWndActive = previous; - if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) return FALSE; - - if (IsWindow(previous)) + /* Prevent a recursive activation loop with the activation messages */ + winflags = win_set_flags(hwnd, WIN_IS_IN_ACTIVATION, 0); + if (!(winflags & WIN_IS_IN_ACTIVATION)) { - SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); - SendMessageW( previous, WM_ACTIVATE, - MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + ret = FALSE; + + /* call CBT hook chain */ + cbt.fMouse = mouse; + cbt.hWndActive = previous; + if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) + goto clear_flags; + + if (IsWindow(previous)) + { + SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); + SendMessageW( previous, WM_ACTIVATE, + MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + } } SERVER_START_REQ( set_active_window ) @@ -106,9 +114,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) previous = wine_server_ptr_handle( reply->previous ); } SERVER_END_REQ; - if (!ret) return FALSE; + if (!ret) goto clear_flags; if (prev) *prev = previous; - if (previous == hwnd) return TRUE; + if (previous == hwnd) goto clear_flags; if (hwnd) { @@ -116,7 +124,11 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (SendMessageW( hwnd, WM_QUERYNEWPALETTE, 0, 0 )) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0, SMTO_ABORTIFHUNG, 2000, NULL ); - if (!IsWindow(hwnd)) return FALSE; + if (!IsWindow(hwnd)) + { + ret = FALSE; + goto clear_flags; + } } old_thread = previous ? GetWindowThreadProcessId( previous, NULL ) : 0; @@ -148,7 +160,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - if (IsWindow(hwnd)) + if (!(winflags & WIN_IS_IN_ACTIVATION) && IsWindow(hwnd)) { SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); SendMessageW( hwnd, WM_ACTIVATE, @@ -173,7 +185,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - return TRUE; +clear_flags: + win_set_flags(hwnd, 0, WIN_IS_IN_ACTIVATION); + return ret; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81b08fc..d53e1a5 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -79,6 +79,7 @@ typedef struct tagWND #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ #define WIN_HAS_IME_WIN 0x0080 /* the window has been registered with imm32 */ +#define WIN_IS_IN_ACTIVATION 0x0100 /* the window is in an activation process */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; -- 2.21.0

2 10

Call for Help: Fix Win10 test failures
by Detlef Riekenberg 23 Apr '19

23 Apr '19

Microsoft did a lot of changes before or with Win10 Build 16299 (marked as 1709). This is discovered by a lot more test failures in winetest, when compared to the older Win10 Build 10240 on the same machine (cw2-gtx560-1709-t64 compared to cw2-gtx560-t64 as an example) Many tests failures look like a more lazy behaviour. for application bugs (use after free / use a busy resource) Please help and fix our tests. Another failure-source is the winetest-failures between different Graphics systems (cw1 with a HD6800, cw2 with a gtx560, newtb vm with emulated vga/spice and a i7 with an intel HD3000), but i didn't look at these yet. http://test.winehq.org/data/f9301c2b66450a1cdd986e9052fcaa76535ba8b7/index_… The results on the machine "dr-i7*" marked with "not run" where removed from winetest-report. The full report is here: http://test.winehq.org/queue/errw_WDX/report -- bye bye ... ... Detlef

2 1

[PATCH V2] ntdll: Improve invalid paramater handling in NtAccessCheck.
by Vijay Kiran Kamuju 23 Apr '19

23 Apr '19

From: Qian Hong <qhong(a)codeweavers.com> From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 8 -------- dlls/ntdll/sec.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64da8b..d886ab713f3 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1454,10 +1454,8 @@ static void test_AccessCheck(void) ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, 0, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1508,12 +1506,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); -todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1625,12 +1620,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); - todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); - todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 02fc77dc1cc..ef91f2319fe 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1667,7 +1667,16 @@ NtAccessCheck( SecurityDescriptor, ClientToken, DesiredAccess, GenericMapping, PrivilegeSet, ReturnLength, GrantedAccess, AccessStatus); - if (!PrivilegeSet || !ReturnLength) + if (!ReturnLength) + return STATUS_ACCESS_VIOLATION; + + if (*ReturnLength == 0) + { + *ReturnLength = sizeof(PRIVILEGE_SET); + return STATUS_BUFFER_TOO_SMALL; + } + + if (!PrivilegeSet) return STATUS_ACCESS_VIOLATION; SERVER_START_REQ( access_check ) -- 2.17.0

1 0

[PATCH] kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian
by Vijay Kiran Kamuju 23 Apr '19

23 Apr '19

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/nls/srb.nls | 2 +- dlls/kernel32/nls/srl.nls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 348cf405239..85de93a6a34 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "пон" LOCALE_SABBREVDAYNAME2 "уто" LOCALE_SABBREVDAYNAME3 "сре" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index 2566b17b489..eaa33db13da 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "pon" LOCALE_SABBREVDAYNAME2 "uto" LOCALE_SABBREVDAYNAME3 "sre" -- 2.17.0

1 0

[PATCH v3] winex11.drv: Search for the drop target in a correct manner.
by John Found 23 Apr '19

23 Apr '19

Signed-off-by: John Found <johnfound(a)asm32.info> --- dlls/winex11.drv/xdnd.c | 54 +++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2ab28e43bf..1f7f0d932b 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -254,6 +254,38 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) XFree(xdndtypes); } +/* Recursively searches for a window on given coordinates in a drag&drop specific manner. + * + * Don't use WindowFromPoint instead, because it omits the STATIC and transparent + * windows, but they can be a valid drop targets if have WS_EX_ACCEPTFILES set. + */ +static HWND window_from_point_dnd(HWND hwnd, POINT point) +{ + HWND child; + ScreenToClient(hwnd, &point); + while ((child = ChildWindowFromPointEx(hwnd, point, CWP_SKIPDISABLED | CWP_SKIPINVISIBLE)) && child != hwnd) + { + MapWindowPoints(hwnd, child, &point, 1); + hwnd = child; + } + + return hwnd; +} + +/* Returns the first window down the hierarchy that has WS_EX_ACCEPTFILES set or + * returns NULL, if such window does not exists. + */ +static HWND window_accepting_files(HWND hwnd) +{ + while (hwnd && !(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) + /* MUST to be GetParent, not GetAncestor, because the owner window + * (with WS_EX_ACCEPTFILES) of a window with WS_POPUP is a valid + * drop target. GetParent works exactly this way! + */ + hwnd = GetParent(hwnd); + return hwnd; +} + /************************************************************************** * X11DRV_XDND_PositionEvent * @@ -270,7 +302,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) HRESULT hr; XDNDxy = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); - targetWindow = WindowFromPoint(XDNDxy); + targetWindow = window_from_point_dnd(hWnd, XDNDxy); pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -334,11 +366,15 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + else { - accept = 1; - effect = DROPEFFECT_COPY; + /* fallback search for window able to accept these files. */ + + if (window_accepting_files(targetWindow) && X11DRV_XDND_HasHDROP()) + { + accept = 1; + effect = DROPEFFECT_COPY; + } } TRACE("actionRequested(%ld) accept(%d) chosen(0x%x) at x(%d),y(%d)\n", @@ -423,10 +459,12 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ - if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + + HWND hwnd_drop = window_accepting_files(window_from_point_dnd(hWnd, XDNDxy)); + + if (hwnd_drop && X11DRV_XDND_HasHDROP()) { - HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + HRESULT hr = X11DRV_XDND_SendDropFiles(hwnd_drop); if (SUCCEEDED(hr)) { accept = 1; -- 2.21.0

1 0

[PATCH 4/4] [resend] comctl32/edit: Fix minimum control size conditions when using EC_USEFONTINFO.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/edit.c | 47 +++++++++++++--------------------------------- dlls/comctl32/tests/edit.c | 16 +--------------- 2 files changed, 14 insertions(+), 49 deletions(-)

1 0

[PATCH 3/4] [resend] comctl32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true when font's charset is CJK. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 47 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-)

1 0

[PATCH 2/4] [resend] comctl32/tests: Skip margin tests if a font for the target charset isn't available.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] comctl32/tests: Use GREEK_CHARSET in margin tests to avoid Associated Charset feature.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Due to Associated Charset feature, we currently use Chinese typeface in the test in zh_CN locale. For consistency with another locale, we should avoid the fature in tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 3/5] dxgi: Implement Alt+Enter handling.
by Zhiyi Zhang 23 Apr '19

23 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 163 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 53da2081e8..9f8539fd28 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -39,6 +39,159 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DECLARE_DEBUG_CHANNEL(winediag); +extern const WCHAR wine_dxgi_associated_factory_propW[]; +extern const WCHAR wine_dxgi_associated_flags_propW[]; + +static struct list dxgi_swapchain_list = LIST_INIT(dxgi_swapchain_list); +static struct list dxgi_hook_list = LIST_INIT(dxgi_hook_list); + +struct dxgi_swapchain_entry +{ + IDXGISwapChain1 *swapchain; + DWORD thread_id; + struct list entry; +}; + +struct dxgi_hook_entry +{ + HHOOK hook; + DWORD thread_id; + struct list entry; +}; + +static LRESULT CALLBACK associated_window_hook_proc(int code, WPARAM wparam, LPARAM lparam) +{ + struct dxgi_swapchain_entry *swapchain_entry; + IDXGIFactory *dxgi_factory; + MSG *msg = (MSG *)lparam; + HANDLE factory_handle; + BOOL skip = FALSE; + BOOL fullscreen; + DWORD flags; + HWND hwnd; + + if (code == HC_ACTION && msg->message == WM_SYSKEYDOWN && msg->wParam == VK_RETURN && (msg->lParam & (KF_ALTDOWN << 16))) + { + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(swapchain_entry, &dxgi_swapchain_list, struct dxgi_swapchain_entry, entry) + { + if (FAILED(IDXGISwapChain1_GetHwnd(swapchain_entry->swapchain, &hwnd)) || hwnd != msg->hwnd) + continue; + + if (FAILED(IDXGISwapChain1_GetParent(swapchain_entry->swapchain, &IID_IDXGIFactory, (void **)&dxgi_factory))) + continue; + IDXGIFactory_Release(dxgi_factory); + + factory_handle = GetPropW(hwnd, wine_dxgi_associated_factory_propW); + flags = (DWORD)(UINT_PTR)GetPropW(hwnd, wine_dxgi_associated_flags_propW); + + if (factory_handle && factory_handle != dxgi_factory) + continue; + + if (flags & (DXGI_MWA_NO_WINDOW_CHANGES | DXGI_MWA_NO_ALT_ENTER)) + break; + + if (SUCCEEDED(IDXGISwapChain1_GetFullscreenState(swapchain_entry->swapchain, &fullscreen, NULL))) + IDXGISwapChain1_SetFullscreenState(swapchain_entry->swapchain, !fullscreen, NULL); + skip = TRUE; + break; + } + wined3d_mutex_unlock(); + } + + return skip ? 1 : CallNextHookEx(0, code, wparam, lparam); +} + +static void add_associated_window_hook(IDXGISwapChain1 *swapchain, HWND hwnd) +{ + struct dxgi_swapchain_entry *swapchain_entry; + struct dxgi_hook_entry *hook_entry; + BOOL has_hook = FALSE; + + if (!hwnd) + return; + + if (!(swapchain_entry = heap_alloc_zero(sizeof(*swapchain_entry)))) + return; + + swapchain_entry->swapchain = swapchain; + swapchain_entry->thread_id = GetWindowThreadProcessId(hwnd, NULL); + wined3d_mutex_lock(); + list_add_head(&dxgi_swapchain_list, &swapchain_entry->entry); + /* Add hook for current thread if needed */ + LIST_FOR_EACH_ENTRY(hook_entry, &dxgi_hook_list, struct dxgi_hook_entry, entry) + { + if (hook_entry->thread_id == swapchain_entry->thread_id) + { + has_hook = TRUE; + break; + } + } + wined3d_mutex_unlock(); + + if (!has_hook) + { + if (!(hook_entry = heap_alloc_zero(sizeof(*hook_entry)))) + { + wined3d_mutex_lock(); + list_remove(&swapchain_entry->entry); + wined3d_mutex_unlock(); + heap_free(swapchain_entry); + return; + } + + hook_entry->thread_id = swapchain_entry->thread_id; + hook_entry->hook = SetWindowsHookExW(WH_GETMESSAGE, associated_window_hook_proc, 0, hook_entry->thread_id); + wined3d_mutex_lock(); + list_add_head(&dxgi_hook_list, &hook_entry->entry); + wined3d_mutex_unlock(); + } +} + +static void remove_associated_window_hook(IDXGISwapChain1 *swapchain) +{ + struct dxgi_swapchain_entry *swapchain_entry, *swapchain_entry2; + struct dxgi_hook_entry *hook_entry, *hook_entry2; + BOOL hook_in_use = FALSE; + DWORD thread_id = 0; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY_SAFE(swapchain_entry, swapchain_entry2, &dxgi_swapchain_list, struct dxgi_swapchain_entry, entry) + { + if (swapchain_entry->swapchain == swapchain) + { + thread_id = swapchain_entry->thread_id; + list_remove(&swapchain_entry->entry); + heap_free(swapchain_entry); + break; + } + } + /* Check if hook is still used by other swapchains */ + LIST_FOR_EACH_ENTRY(swapchain_entry, &dxgi_swapchain_list, struct dxgi_swapchain_entry, entry) + { + if (swapchain_entry->thread_id == thread_id) + { + hook_in_use = TRUE; + break; + } + } + /* Remove hook if it's not longer used by any thread */ + if (!hook_in_use) + { + LIST_FOR_EACH_ENTRY_SAFE(hook_entry, hook_entry2, &dxgi_hook_list, struct dxgi_hook_entry, entry) + { + if (hook_entry->thread_id == thread_id) + { + list_remove(&hook_entry->entry); + UnhookWindowsHookEx(hook_entry->hook); + heap_free(hook_entry); + break; + } + } + } + wined3d_mutex_unlock(); +} + static DXGI_SWAP_EFFECT dxgi_swap_effect_from_wined3d(enum wined3d_swap_effect swap_effect) { switch (swap_effect) @@ -214,6 +367,9 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) if (!refcount) { IWineDXGIDevice *device = swapchain->device; + + remove_associated_window_hook(iface); + if (swapchain->target) { WARN("Releasing fullscreen swapchain.\n"); @@ -842,8 +998,11 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } } + wined3d_mutex_unlock(); + add_associated_window_hook(&swapchain->IDXGISwapChain1_iface, desc->device_window); + return S_OK; cleanup: @@ -1770,6 +1929,8 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; void *vulkan_module = vk_funcs->vulkan_module; + remove_associated_window_hook((IDXGISwapChain1*)&swapchain->IDXGISwapChain3_iface); + d3d12_swapchain_destroy_buffers(swapchain, TRUE); if (swapchain->command_queue) @@ -2731,6 +2892,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IWineDXGIFactory_AddRef(swapchain->factory = factory); + add_associated_window_hook((IDXGISwapChain1*)&swapchain->IDXGISwapChain3_iface, window); + return S_OK; } -- 2.20.1

1 0

[PATCH 2/5] dxgi: Implement dxgi_factory_GetWindowAssociation().
by Zhiyi Zhang 23 Apr '19

23 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/factory.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 5aadef62e4..65783237e7 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -248,9 +248,18 @@ done: static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) { - FIXME("iface %p, window %p stub!\n", iface, window); + TRACE("iface %p, window %p.\n", iface, window); - return E_NOTIMPL; + if (!window) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + /* Yes, tests show that it always return NULL for unknown reason. */ + *window = NULL; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, -- 2.20.1

1 0

[PATCH 3/3] comctl32/edit: Fix minimum control size conditions when using EC_USEFONTINFO.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/edit.c | 47 +++++++++++++--------------------------------- dlls/comctl32/tests/edit.c | 16 +--------------- 2 files changed, 14 insertions(+), 49 deletions(-)

1 0

[PATCH 2/3] comctl32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true when font's charset is CJK. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 47 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-)

1 0

[PATCH 1/3] comctl32/tests: Skip margin tests if a font for the target charset isn't available.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH v2] winex11.drv: Search for the drop target in a correct manner.
by John Found 23 Apr '19

23 Apr '19

Signed-off-by: John Found <johnfound(a)asm32.info> --- dlls/winex11.drv/xdnd.c | 50 ++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2ab28e43bf..ac2fc644dc 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -254,6 +254,34 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) XFree(xdndtypes); } +/* Recursively searches for a window on given coordinates in a drag&drop specific manner. + * + * Don't use WindowFromPoint instead, because it omits the STATIC and transparent + * windows, but they can be a valid drop targets if have WS_EX_ACCEPTFILES set. + */ +static HWND window_from_point_dnd(HWND hwnd, POINT point) +{ + HWND child; + ScreenToClient(hwnd, &point); + while ((child = ChildWindowFromPointEx(hwnd, point, CWP_SKIPDISABLED | CWP_SKIPINVISIBLE)) && child != hwnd) + { + MapWindowPoints(hwnd, child, &point, 1); + hwnd = child; + } + + return hwnd; +} + +/* Returns the first window down the hierarchy that has WS_EX_ACCEPTFILES set or + * returns NULL, if such window does not exists. + */ +static HWND window_accepting_files(HWND hwnd) +{ + while (hwnd && !(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) + hwnd = GetAncestor(hwnd, GA_PARENT); + return hwnd; +} + /************************************************************************** * X11DRV_XDND_PositionEvent * @@ -270,7 +298,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) HRESULT hr; XDNDxy = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); - targetWindow = WindowFromPoint(XDNDxy); + targetWindow = window_from_point_dnd(hWnd, XDNDxy); pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -334,11 +362,15 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + else { - accept = 1; - effect = DROPEFFECT_COPY; + /* fallback search for window able to accept these files. */ + + if (window_accepting_files(targetWindow) && X11DRV_XDND_HasHDROP()) + { + accept = 1; + effect = DROPEFFECT_COPY; + } } TRACE("actionRequested(%ld) accept(%d) chosen(0x%x) at x(%d),y(%d)\n", @@ -423,10 +455,12 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ - if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + + HWND hwnd_drop = window_accepting_files(window_from_point_dnd(hWnd, XDNDxy)); + + if (hwnd_drop && X11DRV_XDND_HasHDROP()) { - HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + HRESULT hr = X11DRV_XDND_SendDropFiles(hwnd_drop); if (SUCCEEDED(hr)) { accept = 1; -- 2.21.0

1 2

[PATCH 2/2] setupapi: Add DECLSPEC_HOTPATCH to SetupDiEnumDeviceInfo().
by Andrey Gusev 23 Apr '19

23 Apr '19

Supersedes 162858 Hitman: Sniper Challenge requires this function to be hotpatchable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 45f4df7346..7440465748 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1707,7 +1707,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFA /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ -BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) +BOOL WINAPI DECLSPEC_HOTPATCH SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) { struct DeviceInfoSet *set; struct device *device; -- 2.20.1

1 0

Re: [PATCH] gdi32/tests: Remove a useless test
by Detlef Riekenberg 23 Apr '19

23 Apr '19

Dimitry wrote: > > > --- a/dlls/gdi32/tests/dc.c > > +++ b/dlls/gdi32/tests/dc.c > > @@ -815,9 +815,6 @@ static void test_DeleteDC(void) > > ret = UnregisterClassA("Wine class DC", GetModuleHandleA(NULL)); > > ok(ret, "UnregisterClassA failed\n"); > > > > - ret = GetObjectType(hdc_test); > > - ok(!ret, "GetObjectType should fail for a deleted DC\n"); > > It should be changed to add broken() instead of removing a perfectly > > valid test. No. The test is a "Use after free" Bug The result of the function-call is an implementation Detail and can change with every Update. Microsoft changed the function-result more than a year ago... There are more 'Use after free' bugs in this file, but the others did not produce test failures yet. -- Bye bye ... ... Detlef

3 2

[RFC PATCH 1/2] kernel32: Move implementation of {Get,Write}PrivateProfileStringW() to helper.
by Jactry Zeng 23 Apr '19

23 Apr '19

Hi folks, This series is trying to fix GetPrivateProfileStringA() to let it can deal with section\key\value with multibyte characters. The related real application is DISTRAINT: Deluxe Edition[1]. It saved localization information in some .ini files and used GetPrivateProfileStringA() for accessing them. The problem is MultiByteToWideChar(CP_ACP) in PROFILE_Load() will return decomposed string with '0x003f' for some multibyte characters when LC_CTYPE is zh_CN.UTF-8 or ja_JP.UTF-8. Then PROFILE_Load() will cache an wrong string and return a wrong result for GetPrivateProfileStringA(). But I'm not very sure if this is a good way to fix this issue since it hard coding codepage to 1252 for MultiByteToWideChar()/WideCharToMultiByte(). Any comments would be appreciated! [1] https://store.steampowered.com/app/395170/DISTRAINT_Deluxe_Edition/ Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/kernel32/profile.c | 97 ++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 027693e5da..462d64e5f0 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1082,17 +1082,13 @@ UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val ) return GetPrivateProfileIntW( section, entry, def_val, wininiW ); } -/*********************************************************************** - * GetPrivateProfileStringW (KERNEL32.@) - */ -INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, - LPCWSTR def_val, LPWSTR buffer, - UINT len, LPCWSTR filename ) +static int get_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, + LPWSTR buffer, UINT len, LPCWSTR filename) { - int ret; - LPWSTR defval_tmp = NULL; + int ret; + LPWSTR defval_tmp = NULL; - TRACE("%s,%s,%s,%p,%u,%s\n", debugstr_w(section), debugstr_w(entry), + TRACE("(%s, %s, %s, %p, %u, %s)\n", debugstr_w(section), debugstr_w(entry), debugstr_w(def_val), buffer, len, debugstr_w(filename)); /* strip any trailing ' ' of def_val. */ @@ -1114,22 +1110,25 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, } } - RtlEnterCriticalSection( &PROFILE_CritSect ); + RtlEnterCriticalSection(&PROFILE_CritSect); - if (PROFILE_Open( filename, FALSE )) { - if (section == NULL) + if (PROFILE_Open(filename, FALSE)) + { + if (section == NULL) ret = PROFILE_GetSectionNames(buffer, len); - else - /* PROFILE_GetString can handle the 'entry == NULL' case */ - ret = PROFILE_GetString( section, entry, def_val, buffer, len ); - } else if (buffer && def_val) { - lstrcpynW( buffer, def_val, len ); - ret = strlenW( buffer ); + else + /* PROFILE_GetString can handle the 'entry == NULL' case */ + ret = PROFILE_GetString(section, entry, def_val, buffer, len); + } + else if (buffer && def_val) + { + lstrcpynW(buffer, def_val, len); + ret = strlenW(buffer); } else - ret = 0; + ret = 0; - RtlLeaveCriticalSection( &PROFILE_CritSect ); + RtlLeaveCriticalSection(&PROFILE_CritSect); HeapFree(GetProcessHeap(), 0, defval_tmp); @@ -1138,12 +1137,23 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, return ret; } +/*********************************************************************** + * GetPrivateProfileStringW (KERNEL32.@) + */ +INT WINAPI GetPrivateProfileStringW(LPCWSTR section, LPCWSTR entry, + LPCWSTR def_val, LPWSTR buffer, + UINT len, LPCWSTR filename) +{ + return get_private_profile_string(section, entry, def_val, buffer, + len, filename); +} + /*********************************************************************** * GetPrivateProfileStringA (KERNEL32.@) */ -INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, - LPCSTR def_val, LPSTR buffer, - UINT len, LPCSTR filename ) +INT WINAPI GetPrivateProfileStringA(LPCSTR section, LPCSTR entry, + LPCSTR def_val, LPSTR buffer, + UINT len, LPCSTR filename) { UNICODE_STRING sectionW, entryW, def_valW, filenameW; LPWSTR bufferW; @@ -1159,9 +1169,9 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retW = GetPrivateProfileStringW( sectionW.Buffer, entryW.Buffer, - def_valW.Buffer, bufferW, len, - filenameW.Buffer); + retW = get_private_profile_string(sectionW.Buffer, entryW.Buffer, + def_valW.Buffer, bufferW, len, + filenameW.Buffer); if (len && buffer) { if (retW) @@ -1358,38 +1368,47 @@ INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) return GetPrivateProfileSectionW( section, buffer, len, wininiW ); } - -/*********************************************************************** - * WritePrivateProfileStringW (KERNEL32.@) - */ -BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, - LPCWSTR string, LPCWSTR filename ) +static BOOL write_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR string, + LPCWSTR filename) { BOOL ret = FALSE; - RtlEnterCriticalSection( &PROFILE_CritSect ); + TRACE("(%s, %s, %s, %s)\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(string), debugstr_w(filename)); + + RtlEnterCriticalSection(&PROFILE_CritSect); if (!section && !entry && !string) /* documented "file flush" case */ { - if (!filename || PROFILE_Open( filename, TRUE )) + if (!filename || PROFILE_Open(filename, TRUE)) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open( filename, TRUE )) + else if (PROFILE_Open(filename, TRUE)) { if (!section) { SetLastError(ERROR_FILE_NOT_FOUND); } else { - ret = PROFILE_SetString( section, entry, string, FALSE); + ret = PROFILE_SetString(section, entry, string, FALSE); if (ret) ret = PROFILE_FlushFile(); } } - RtlLeaveCriticalSection( &PROFILE_CritSect ); + RtlLeaveCriticalSection(&PROFILE_CritSect); return ret; } +/*********************************************************************** + * WritePrivateProfileStringW (KERNEL32.@) + */ +BOOL WINAPI WritePrivateProfileStringW(LPCWSTR section, LPCWSTR entry, + LPCWSTR string, LPCWSTR filename) +{ + return write_private_profile_string(section, entry, string, + filename); +} + /*********************************************************************** * WritePrivateProfileStringA (KERNEL32.@) */ @@ -1408,8 +1427,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH WritePrivateProfileStringA( LPCSTR section, LPCSTR if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - ret = WritePrivateProfileStringW(sectionW.Buffer, entryW.Buffer, - stringW.Buffer, filenameW.Buffer); + ret = write_private_profile_string(sectionW.Buffer, entryW.Buffer, + stringW.Buffer, filenameW.Buffer); RtlFreeUnicodeString(&sectionW); RtlFreeUnicodeString(&entryW); RtlFreeUnicodeString(&stringW); -- 2.20.1

2 5

[PATCH V2 1/3] kernel/nls: add LOCALE_SMONTHDAY to all supported languages
by Vijay Kiran Kamuju 23 Apr '19

23 Apr '19

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/nls/afk.nls | 1 + dlls/kernel32/nls/ara.nls | 1 + dlls/kernel32/nls/arb.nls | 1 + dlls/kernel32/nls/are.nls | 1 + dlls/kernel32/nls/arg.nls | 1 + dlls/kernel32/nls/arh.nls | 1 + dlls/kernel32/nls/ari.nls | 1 + dlls/kernel32/nls/arj.nls | 1 + dlls/kernel32/nls/ark.nls | 1 + dlls/kernel32/nls/arl.nls | 1 + dlls/kernel32/nls/arm.nls | 1 + dlls/kernel32/nls/aro.nls | 1 + dlls/kernel32/nls/arq.nls | 1 + dlls/kernel32/nls/ars.nls | 1 + dlls/kernel32/nls/art.nls | 1 + dlls/kernel32/nls/aru.nls | 1 + dlls/kernel32/nls/ary.nls | 1 + dlls/kernel32/nls/aze.nls | 1 + dlls/kernel32/nls/azl.nls | 1 + dlls/kernel32/nls/bel.nls | 1 + dlls/kernel32/nls/ben.nls | 1 + dlls/kernel32/nls/bgr.nls | 1 + dlls/kernel32/nls/brf.nls | 1 + dlls/kernel32/nls/cat.nls | 1 + dlls/kernel32/nls/chs.nls | 1 + dlls/kernel32/nls/cht.nls | 1 + dlls/kernel32/nls/cor.nls | 1 + dlls/kernel32/nls/csy.nls | 1 + dlls/kernel32/nls/cym.nls | 1 + dlls/kernel32/nls/dan.nls | 1 + dlls/kernel32/nls/dea.nls | 1 + dlls/kernel32/nls/dec.nls | 1 + dlls/kernel32/nls/del.nls | 1 + dlls/kernel32/nls/des.nls | 1 + dlls/kernel32/nls/deu.nls | 1 + dlls/kernel32/nls/div.nls | 1 + dlls/kernel32/nls/ell.nls | 1 + dlls/kernel32/nls/ena.nls | 1 + dlls/kernel32/nls/enb.nls | 1 + dlls/kernel32/nls/enc.nls | 1 + dlls/kernel32/nls/eng.nls | 1 + dlls/kernel32/nls/eni.nls | 1 + dlls/kernel32/nls/enj.nls | 1 + dlls/kernel32/nls/enl.nls | 1 + dlls/kernel32/nls/enp.nls | 1 + dlls/kernel32/nls/ens.nls | 1 + dlls/kernel32/nls/ent.nls | 1 + dlls/kernel32/nls/enu.nls | 1 + dlls/kernel32/nls/enw.nls | 1 + dlls/kernel32/nls/enz.nls | 1 + dlls/kernel32/nls/eox.nls | 1 + dlls/kernel32/nls/esa.nls | 1 + dlls/kernel32/nls/esb.nls | 1 + dlls/kernel32/nls/esc.nls | 1 + dlls/kernel32/nls/esd.nls | 1 + dlls/kernel32/nls/ese.nls | 1 + dlls/kernel32/nls/esf.nls | 1 + dlls/kernel32/nls/esg.nls | 1 + dlls/kernel32/nls/esh.nls | 1 + dlls/kernel32/nls/esi.nls | 1 + dlls/kernel32/nls/esl.nls | 1 + dlls/kernel32/nls/esm.nls | 1 + dlls/kernel32/nls/esn.nls | 1 + dlls/kernel32/nls/eso.nls | 1 + dlls/kernel32/nls/esp.nls | 1 + dlls/kernel32/nls/esr.nls | 1 + dlls/kernel32/nls/ess.nls | 1 + dlls/kernel32/nls/esu.nls | 1 + dlls/kernel32/nls/esv.nls | 1 + dlls/kernel32/nls/esy.nls | 1 + dlls/kernel32/nls/esz.nls | 1 + dlls/kernel32/nls/eti.nls | 1 + dlls/kernel32/nls/euq.nls | 1 + dlls/kernel32/nls/far.nls | 1 + dlls/kernel32/nls/fin.nls | 1 + dlls/kernel32/nls/fos.nls | 1 + dlls/kernel32/nls/fra.nls | 1 + dlls/kernel32/nls/frb.nls | 1 + dlls/kernel32/nls/frc.nls | 1 + dlls/kernel32/nls/frl.nls | 1 + dlls/kernel32/nls/frm.nls | 1 + dlls/kernel32/nls/frs.nls | 1 + dlls/kernel32/nls/gae.nls | 1 + dlls/kernel32/nls/gdh.nls | 1 + dlls/kernel32/nls/gdv.nls | 2 +- dlls/kernel32/nls/glc.nls | 1 + dlls/kernel32/nls/guj.nls | 1 + dlls/kernel32/nls/heb.nls | 1 + dlls/kernel32/nls/hin.nls | 1 + dlls/kernel32/nls/hrv.nls | 1 + dlls/kernel32/nls/hun.nls | 1 + dlls/kernel32/nls/hye.nls | 1 + dlls/kernel32/nls/ind.nls | 1 + dlls/kernel32/nls/isl.nls | 1 + dlls/kernel32/nls/ita.nls | 1 + dlls/kernel32/nls/its.nls | 1 + dlls/kernel32/nls/ivl.nls | 1 + dlls/kernel32/nls/jpn.nls | 1 + dlls/kernel32/nls/kan.nls | 1 + dlls/kernel32/nls/kat.nls | 1 + dlls/kernel32/nls/kkz.nls | 1 + dlls/kernel32/nls/knk.nls | 1 + dlls/kernel32/nls/kor.nls | 1 + dlls/kernel32/nls/kyr.nls | 1 + dlls/kernel32/nls/lth.nls | 1 + dlls/kernel32/nls/lvi.nls | 1 + dlls/kernel32/nls/mar.nls | 1 + dlls/kernel32/nls/mki.nls | 1 + dlls/kernel32/nls/mon.nls | 1 + dlls/kernel32/nls/msb.nls | 1 + dlls/kernel32/nls/msl.nls | 1 + dlls/kernel32/nls/nep.nls | 1 + dlls/kernel32/nls/nlb.nls | 1 + dlls/kernel32/nls/nld.nls | 1 + dlls/kernel32/nls/nls.nls | 1 + dlls/kernel32/nls/non.nls | 1 + dlls/kernel32/nls/nor.nls | 1 + dlls/kernel32/nls/pan.nls | 1 + dlls/kernel32/nls/plk.nls | 1 + dlls/kernel32/nls/ptb.nls | 1 + dlls/kernel32/nls/ptg.nls | 1 + dlls/kernel32/nls/rmc.nls | 1 + dlls/kernel32/nls/rom.nls | 1 + dlls/kernel32/nls/rus.nls | 1 + dlls/kernel32/nls/san.nls | 1 + dlls/kernel32/nls/sin.nls | 1 + dlls/kernel32/nls/sky.nls | 1 + dlls/kernel32/nls/slv.nls | 1 + dlls/kernel32/nls/sqi.nls | 1 + dlls/kernel32/nls/srb.nls | 1 + dlls/kernel32/nls/srl.nls | 1 + dlls/kernel32/nls/sve.nls | 1 + dlls/kernel32/nls/svf.nls | 1 + dlls/kernel32/nls/swk.nls | 1 + dlls/kernel32/nls/syr.nls | 1 + dlls/kernel32/nls/tam.nls | 1 + dlls/kernel32/nls/tel.nls | 1 + dlls/kernel32/nls/tha.nls | 1 + dlls/kernel32/nls/trk.nls | 1 + dlls/kernel32/nls/ttt.nls | 1 + dlls/kernel32/nls/ukr.nls | 1 + dlls/kernel32/nls/urd.nls | 1 + dlls/kernel32/nls/uzb.nls | 1 + dlls/kernel32/nls/uzl.nls | 1 + dlls/kernel32/nls/vit.nls | 1 + dlls/kernel32/nls/wal.nls | 1 + dlls/kernel32/nls/zhh.nls | 1 + dlls/kernel32/nls/zhi.nls | 1 + dlls/kernel32/nls/zhm.nls | 1 + 149 files changed, 149 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/afk.nls b/dlls/kernel32/nls/afk.nls index 350b3c31fdc..6225c47107e 100644 --- a/dlls/kernel32/nls/afk.nls +++ b/dlls/kernel32/nls/afk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januarie" LOCALE_SMONTHNAME2 "Februarie" LOCALE_SMONTHNAME3 "Maart" diff --git a/dlls/kernel32/nls/ara.nls b/dlls/kernel32/nls/ara.nls index a7a3937156f..c3eb6f9a108 100644 --- a/dlls/kernel32/nls/ara.nls +++ b/dlls/kernel32/nls/ara.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arb.nls b/dlls/kernel32/nls/arb.nls index 8bc2ba1f33d..dd3c328277d 100644 --- a/dlls/kernel32/nls/arb.nls +++ b/dlls/kernel32/nls/arb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "كانون الثاني" LOCALE_SMONTHNAME2 "شباط" LOCALE_SMONTHNAME3 "آذار" diff --git a/dlls/kernel32/nls/are.nls b/dlls/kernel32/nls/are.nls index 6b94dd68a0e..4f39b76191a 100644 --- a/dlls/kernel32/nls/are.nls +++ b/dlls/kernel32/nls/are.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arg.nls b/dlls/kernel32/nls/arg.nls index 38ea3631a84..096945efd12 100644 --- a/dlls/kernel32/nls/arg.nls +++ b/dlls/kernel32/nls/arg.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "جانفييه" LOCALE_SMONTHNAME2 "فيفرييه" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arh.nls b/dlls/kernel32/nls/arh.nls index c945fceac00..ad33914fa33 100644 --- a/dlls/kernel32/nls/arh.nls +++ b/dlls/kernel32/nls/arh.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/ari.nls b/dlls/kernel32/nls/ari.nls index e827848bc9c..d405c1b90b9 100644 --- a/dlls/kernel32/nls/ari.nls +++ b/dlls/kernel32/nls/ari.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "كانون الثاني" LOCALE_SMONTHNAME2 "شباط" LOCALE_SMONTHNAME3 "آذار" diff --git a/dlls/kernel32/nls/arj.nls b/dlls/kernel32/nls/arj.nls index 58759376354..e24a636b156 100644 --- a/dlls/kernel32/nls/arj.nls +++ b/dlls/kernel32/nls/arj.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "كانون الثاني" LOCALE_SMONTHNAME2 "شباط" LOCALE_SMONTHNAME3 "آذار" diff --git a/dlls/kernel32/nls/ark.nls b/dlls/kernel32/nls/ark.nls index f9a64487a0d..7fbb44d9265 100644 --- a/dlls/kernel32/nls/ark.nls +++ b/dlls/kernel32/nls/ark.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arl.nls b/dlls/kernel32/nls/arl.nls index 540b39e076d..bfd98e61390 100644 --- a/dlls/kernel32/nls/arl.nls +++ b/dlls/kernel32/nls/arl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arm.nls b/dlls/kernel32/nls/arm.nls index 416e9cb3db6..01782330fe9 100644 --- a/dlls/kernel32/nls/arm.nls +++ b/dlls/kernel32/nls/arm.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "جانفييه" LOCALE_SMONTHNAME2 "فيفرييه" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/aro.nls b/dlls/kernel32/nls/aro.nls index faaf5a38372..0a17050796a 100644 --- a/dlls/kernel32/nls/aro.nls +++ b/dlls/kernel32/nls/aro.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arq.nls b/dlls/kernel32/nls/arq.nls index 4c983af2206..d27b91a191b 100644 --- a/dlls/kernel32/nls/arq.nls +++ b/dlls/kernel32/nls/arq.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/ars.nls b/dlls/kernel32/nls/ars.nls index 9e731826d33..37553db7fdc 100644 --- a/dlls/kernel32/nls/ars.nls +++ b/dlls/kernel32/nls/ars.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "كانون الثاني" LOCALE_SMONTHNAME2 "شباط" LOCALE_SMONTHNAME3 "آذار" diff --git a/dlls/kernel32/nls/art.nls b/dlls/kernel32/nls/art.nls index a647bbdc94b..5abe9e9c812 100644 --- a/dlls/kernel32/nls/art.nls +++ b/dlls/kernel32/nls/art.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "جانفي" LOCALE_SMONTHNAME2 "فيفري" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/aru.nls b/dlls/kernel32/nls/aru.nls index 64d4b71f0b8..8b3b68883b5 100644 --- a/dlls/kernel32/nls/aru.nls +++ b/dlls/kernel32/nls/aru.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/ary.nls b/dlls/kernel32/nls/ary.nls index ed7549eeb8f..34a3234b263 100644 --- a/dlls/kernel32/nls/ary.nls +++ b/dlls/kernel32/nls/ary.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls index bc2db0d0c75..d2a3c15b3df 100644 --- a/dlls/kernel32/nls/aze.nls +++ b/dlls/kernel32/nls/aze.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Јанвар" LOCALE_SMONTHNAME2 "Феврал" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/azl.nls b/dlls/kernel32/nls/azl.nls index 6c5233a2385..b14672c9990 100644 --- a/dlls/kernel32/nls/azl.nls +++ b/dlls/kernel32/nls/azl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Yanvar" LOCALE_SMONTHNAME2 "Fevral" LOCALE_SMONTHNAME3 "Mart" diff --git a/dlls/kernel32/nls/bel.nls b/dlls/kernel32/nls/bel.nls index 3d046ba729c..d98514c1726 100644 --- a/dlls/kernel32/nls/bel.nls +++ b/dlls/kernel32/nls/bel.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;3" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Студзень\0студзеня" LOCALE_SMONTHNAME2 "Люты\0лютага" LOCALE_SMONTHNAME3 "Сакавік\0сакавіка" diff --git a/dlls/kernel32/nls/ben.nls b/dlls/kernel32/nls/ben.nls index d848937c2fd..c87a122eed8 100644 --- a/dlls/kernel32/nls/ben.nls +++ b/dlls/kernel32/nls/ben.nls @@ -103,6 +103,7 @@ STRINGTABLE LANGUAGE LANG_BANGLA, SUBLANG_BANGLA_INDIA LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "জানুয়ারী" LOCALE_SMONTHNAME2 "ফেব্রুয়ারী" LOCALE_SMONTHNAME3 "মার্চ" diff --git a/dlls/kernel32/nls/bgr.nls b/dlls/kernel32/nls/bgr.nls index 7c8732886f2..1e096a188fd 100644 --- a/dlls/kernel32/nls/bgr.nls +++ b/dlls/kernel32/nls/bgr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy 'г.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Януари" LOCALE_SMONTHNAME2 "Февруари" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/brf.nls b/dlls/kernel32/nls/brf.nls index 1e19c504041..1b80651f96b 100644 --- a/dlls/kernel32/nls/brf.nls +++ b/dlls/kernel32/nls/brf.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Genver" LOCALE_SMONTHNAME2 "C'hwevrer" LOCALE_SMONTHNAME3 "Meurzh" diff --git a/dlls/kernel32/nls/cat.nls b/dlls/kernel32/nls/cat.nls index c2b386f9b1d..e8192b49c94 100644 --- a/dlls/kernel32/nls/cat.nls +++ b/dlls/kernel32/nls/cat.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "gener" LOCALE_SMONTHNAME2 "febrer" LOCALE_SMONTHNAME3 "març" diff --git a/dlls/kernel32/nls/chs.nls b/dlls/kernel32/nls/chs.nls index 6dc66a3aa37..187700d8489 100644 --- a/dlls/kernel32/nls/chs.nls +++ b/dlls/kernel32/nls/chs.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "一月" LOCALE_SMONTHNAME2 "二月" LOCALE_SMONTHNAME3 "三月" diff --git a/dlls/kernel32/nls/cht.nls b/dlls/kernel32/nls/cht.nls index c08b807a9da..f10fc637d42 100644 --- a/dlls/kernel32/nls/cht.nls +++ b/dlls/kernel32/nls/cht.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "一月" LOCALE_SMONTHNAME2 "二月" LOCALE_SMONTHNAME3 "三月" diff --git a/dlls/kernel32/nls/cor.nls b/dlls/kernel32/nls/cor.nls index ab6cbde28bf..bb8ed9087c8 100644 --- a/dlls/kernel32/nls/cor.nls +++ b/dlls/kernel32/nls/cor.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_CORNISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "Mys Genver" LOCALE_SMONTHNAME2 "Mys Whevrel" LOCALE_SMONTHNAME3 "Mys Merth" diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls index 7d7aa0e94f3..982fe068e11 100644 --- a/dlls/kernel32/nls/csy.nls +++ b/dlls/kernel32/nls/csy.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "leden\0ledna" LOCALE_SMONTHNAME2 "únor\0února" LOCALE_SMONTHNAME3 "březen\0března" diff --git a/dlls/kernel32/nls/cym.nls b/dlls/kernel32/nls/cym.nls index f609eb35f01..a1eb319a29b 100644 --- a/dlls/kernel32/nls/cym.nls +++ b/dlls/kernel32/nls/cym.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Ionawr" LOCALE_SMONTHNAME2 "Chwefror" LOCALE_SMONTHNAME3 "Mawrth" diff --git a/dlls/kernel32/nls/dan.nls b/dlls/kernel32/nls/dan.nls index ecd516e686e..db2799bfa53 100644 --- a/dlls/kernel32/nls/dan.nls +++ b/dlls/kernel32/nls/dan.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "marts" diff --git a/dlls/kernel32/nls/dea.nls b/dlls/kernel32/nls/dea.nls index 7b5147045f7..b35cac95d13 100644 --- a/dlls/kernel32/nls/dea.nls +++ b/dlls/kernel32/nls/dea.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN LOCALE_SLONGDATE "dddd, dd. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Jänner" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/dec.nls b/dlls/kernel32/nls/dec.nls index 0a7a80c7ebf..0668d7924cb 100644 --- a/dlls/kernel32/nls/dec.nls +++ b/dlls/kernel32/nls/dec.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januar" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/del.nls b/dlls/kernel32/nls/del.nls index a57f71604ee..349320d6bfa 100644 --- a/dlls/kernel32/nls/del.nls +++ b/dlls/kernel32/nls/del.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januar" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/des.nls b/dlls/kernel32/nls/des.nls index 26b12878f74..48f463d57dd 100644 --- a/dlls/kernel32/nls/des.nls +++ b/dlls/kernel32/nls/des.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januar" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/deu.nls b/dlls/kernel32/nls/deu.nls index 83d88eb7461..9742fabe5eb 100644 --- a/dlls/kernel32/nls/deu.nls +++ b/dlls/kernel32/nls/deu.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januar" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/div.nls b/dlls/kernel32/nls/div.nls index 9fa2fd0e7ee..8169aa3c4e0 100644 --- a/dlls/kernel32/nls/div.nls +++ b/dlls/kernel32/nls/div.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_DIVEHI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "ޖެނުއަރީ" LOCALE_SMONTHNAME2 "ފެބުރުއަރީ" LOCALE_SMONTHNAME3 "މާޗް" diff --git a/dlls/kernel32/nls/ell.nls b/dlls/kernel32/nls/ell.nls index 63e8a2d1572..f2f1a05d371 100644 --- a/dlls/kernel32/nls/ell.nls +++ b/dlls/kernel32/nls/ell.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GREEK, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Ιανουάριος" LOCALE_SMONTHNAME2 "Φεβρουάριος" LOCALE_SMONTHNAME3 "Μάρτιος" diff --git a/dlls/kernel32/nls/ena.nls b/dlls/kernel32/nls/ena.nls index 26d51dae34b..54f9e0361e7 100644 --- a/dlls/kernel32/nls/ena.nls +++ b/dlls/kernel32/nls/ena.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS LOCALE_SLONGDATE "dddd, d MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls index 7aa6facc699..c6526005a9e 100644 --- a/dlls/kernel32/nls/enb.nls +++ b/dlls/kernel32/nls/enb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enc.nls b/dlls/kernel32/nls/enc.nls index 42cbe9e0c62..c71fd4afc96 100644 --- a/dlls/kernel32/nls/enc.nls +++ b/dlls/kernel32/nls/enc.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN LOCALE_SLONGDATE "MMMM d, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/eng.nls b/dlls/kernel32/nls/eng.nls index 5f66fe42620..bbf76560ca9 100644 --- a/dlls/kernel32/nls/eng.nls +++ b/dlls/kernel32/nls/eng.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/eni.nls b/dlls/kernel32/nls/eni.nls index 298a97d761d..2316a3ed4b2 100644 --- a/dlls/kernel32/nls/eni.nls +++ b/dlls/kernel32/nls/eni.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enj.nls b/dlls/kernel32/nls/enj.nls index cf575e54ab5..bab9960108c 100644 --- a/dlls/kernel32/nls/enj.nls +++ b/dlls/kernel32/nls/enj.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enl.nls b/dlls/kernel32/nls/enl.nls index fd7b2bcd9ec..2c9e794d891 100644 --- a/dlls/kernel32/nls/enl.nls +++ b/dlls/kernel32/nls/enl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE LOCALE_SLONGDATE "dddd, dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enp.nls b/dlls/kernel32/nls/enp.nls index 4c37be19fd6..ab76dd706d1 100644 --- a/dlls/kernel32/nls/enp.nls +++ b/dlls/kernel32/nls/enp.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/ens.nls b/dlls/kernel32/nls/ens.nls index 6c8aa16f867..3d2033e5f90 100644 --- a/dlls/kernel32/nls/ens.nls +++ b/dlls/kernel32/nls/ens.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/ent.nls b/dlls/kernel32/nls/ent.nls index 4285577596d..79153c6dc4b 100644 --- a/dlls/kernel32/nls/ent.nls +++ b/dlls/kernel32/nls/ent.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD LOCALE_SLONGDATE "dddd, dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enu.nls b/dlls/kernel32/nls/enu.nls index 119b9cc18c5..0eea48723e6 100644 --- a/dlls/kernel32/nls/enu.nls +++ b/dlls/kernel32/nls/enu.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enw.nls b/dlls/kernel32/nls/enw.nls index 26d04cb6140..0e2e0bffb0c 100644 --- a/dlls/kernel32/nls/enw.nls +++ b/dlls/kernel32/nls/enw.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_ZIMBABWE LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enz.nls b/dlls/kernel32/nls/enz.nls index 66baca17834..06295d5d499 100644 --- a/dlls/kernel32/nls/enz.nls +++ b/dlls/kernel32/nls/enz.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_NZ LOCALE_SLONGDATE "dddd, d MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index 0dc82fe3a77..5a4bc2370ef 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -125,6 +125,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SLONGDATE "ddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "januaro" LOCALE_SMONTHNAME2 "februaro" LOCALE_SMONTHNAME3 "marto" diff --git a/dlls/kernel32/nls/esa.nls b/dlls/kernel32/nls/esa.nls index 3b850095c36..0b03d3939ea 100644 --- a/dlls/kernel32/nls/esa.nls +++ b/dlls/kernel32/nls/esa.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esb.nls b/dlls/kernel32/nls/esb.nls index ade33beec12..b6669b862c0 100644 --- a/dlls/kernel32/nls/esb.nls +++ b/dlls/kernel32/nls/esb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esc.nls b/dlls/kernel32/nls/esc.nls index d34eb31a0c7..f4171baa1c0 100644 --- a/dlls/kernel32/nls/esc.nls +++ b/dlls/kernel32/nls/esc.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esd.nls b/dlls/kernel32/nls/esd.nls index cd549adf4e6..988f26ad402 100644 --- a/dlls/kernel32/nls/esd.nls +++ b/dlls/kernel32/nls/esd.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/ese.nls b/dlls/kernel32/nls/ese.nls index b39fde0f5bd..e1fe67a8c70 100644 --- a/dlls/kernel32/nls/ese.nls +++ b/dlls/kernel32/nls/ese.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esf.nls b/dlls/kernel32/nls/esf.nls index d3a5a7129d4..2e87edfcdda 100644 --- a/dlls/kernel32/nls/esf.nls +++ b/dlls/kernel32/nls/esf.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esg.nls b/dlls/kernel32/nls/esg.nls index ed6fa4b0a7e..1519a12ce30 100644 --- a/dlls/kernel32/nls/esg.nls +++ b/dlls/kernel32/nls/esg.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esh.nls b/dlls/kernel32/nls/esh.nls index 701f55a1c01..c8342a40b7b 100644 --- a/dlls/kernel32/nls/esh.nls +++ b/dlls/kernel32/nls/esh.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esi.nls b/dlls/kernel32/nls/esi.nls index 8f0948e1f3e..23843939f1c 100644 --- a/dlls/kernel32/nls/esi.nls +++ b/dlls/kernel32/nls/esi.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esl.nls b/dlls/kernel32/nls/esl.nls index 04648a7ea5e..6d48cf5fedd 100644 --- a/dlls/kernel32/nls/esl.nls +++ b/dlls/kernel32/nls/esl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esm.nls b/dlls/kernel32/nls/esm.nls index 514ea13f56a..9a515673da3 100644 --- a/dlls/kernel32/nls/esm.nls +++ b/dlls/kernel32/nls/esm.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esn.nls b/dlls/kernel32/nls/esn.nls index 627eda2e9e7..a291db867ee 100644 --- a/dlls/kernel32/nls/esn.nls +++ b/dlls/kernel32/nls/esn.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "enero" LOCALE_SMONTHNAME2 "febrero" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/eso.nls b/dlls/kernel32/nls/eso.nls index 3c4252a6e5b..15da10aeb38 100644 --- a/dlls/kernel32/nls/eso.nls +++ b/dlls/kernel32/nls/eso.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esp.nls b/dlls/kernel32/nls/esp.nls index 3774e283d0c..abd326acbd6 100644 --- a/dlls/kernel32/nls/esp.nls +++ b/dlls/kernel32/nls/esp.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "enero" LOCALE_SMONTHNAME2 "febrero" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/esr.nls b/dlls/kernel32/nls/esr.nls index 937e3cba394..fd3b788f5a2 100644 --- a/dlls/kernel32/nls/esr.nls +++ b/dlls/kernel32/nls/esr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/ess.nls b/dlls/kernel32/nls/ess.nls index 7819d4589d0..ae1863973cb 100644 --- a/dlls/kernel32/nls/ess.nls +++ b/dlls/kernel32/nls/ess.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esu.nls b/dlls/kernel32/nls/esu.nls index fb1e411dcd4..46cd5c77ba5 100644 --- a/dlls/kernel32/nls/esu.nls +++ b/dlls/kernel32/nls/esu.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esv.nls b/dlls/kernel32/nls/esv.nls index 31b1b8f918c..f6661abb894 100644 --- a/dlls/kernel32/nls/esv.nls +++ b/dlls/kernel32/nls/esv.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esy.nls b/dlls/kernel32/nls/esy.nls index f977cab0cd5..8b170de0223 100644 --- a/dlls/kernel32/nls/esy.nls +++ b/dlls/kernel32/nls/esy.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esz.nls b/dlls/kernel32/nls/esz.nls index 7e5d4aeaf1e..09ca6c7d9ff 100644 --- a/dlls/kernel32/nls/esz.nls +++ b/dlls/kernel32/nls/esz.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/eti.nls b/dlls/kernel32/nls/eti.nls index 2a04fabb105..d8a984477af 100644 --- a/dlls/kernel32/nls/eti.nls +++ b/dlls/kernel32/nls/eti.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy'. a.'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "jaanuar" LOCALE_SMONTHNAME2 "veebruar" LOCALE_SMONTHNAME3 "märts" diff --git a/dlls/kernel32/nls/euq.nls b/dlls/kernel32/nls/euq.nls index ede760e1dc9..036aa18ecd2 100644 --- a/dlls/kernel32/nls/euq.nls +++ b/dlls/kernel32/nls/euq.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, yyyy.'eko' MMMM'k 'd" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "urtarrila" LOCALE_SMONTHNAME2 "otsaila" LOCALE_SMONTHNAME3 "martxoa" diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 4b598b4ad86..7cc3fae408b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy/MM/dd" LOCALE_SMONDECIMALSEP "٫" LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ژانویه" LOCALE_SMONTHNAME2 "فوریه" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/fin.nls b/dlls/kernel32/nls/fin.nls index ab6d4e11405..9ceea69bf55 100644 --- a/dlls/kernel32/nls/fin.nls +++ b/dlls/kernel32/nls/fin.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM'ta 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM'ta'" LOCALE_SMONTHNAME1 "tammikuu" LOCALE_SMONTHNAME2 "helmikuu" LOCALE_SMONTHNAME3 "maaliskuu" diff --git a/dlls/kernel32/nls/fos.nls b/dlls/kernel32/nls/fos.nls index eaca95cb281..262d8564fe8 100644 --- a/dlls/kernel32/nls/fos.nls +++ b/dlls/kernel32/nls/fos.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FAEROESE, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls index d0046a34f63..bbbabf37a47 100644 --- a/dlls/kernel32/nls/fra.nls +++ b/dlls/kernel32/nls/fra.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls index a4732e33b73..8a6c844cb49 100644 --- a/dlls/kernel32/nls/frb.nls +++ b/dlls/kernel32/nls/frb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls index 9a617b1af71..3d64bb77281 100644 --- a/dlls/kernel32/nls/frc.nls +++ b/dlls/kernel32/nls/frc.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN LOCALE_SLONGDATE "d MMMM, yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls index d3b5e8ff2ab..0d4d7fc0cd3 100644 --- a/dlls/kernel32/nls/frl.nls +++ b/dlls/kernel32/nls/frl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls index cf917ebc484..bcfbb56d3c5 100644 --- a/dlls/kernel32/nls/frm.nls +++ b/dlls/kernel32/nls/frm.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls index 4249939da9b..592e0e692ee 100644 --- a/dlls/kernel32/nls/frs.nls +++ b/dlls/kernel32/nls/frs.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/gae.nls b/dlls/kernel32/nls/gae.nls index 1d551048c25..5490dddd8df 100644 --- a/dlls/kernel32/nls/gae.nls +++ b/dlls/kernel32/nls/gae.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Eanáir" LOCALE_SMONTHNAME2 "Feabhra" LOCALE_SMONTHNAME3 "Márta" diff --git a/dlls/kernel32/nls/gdh.nls b/dlls/kernel32/nls/gdh.nls index 5718482efe4..7f60c5130ae 100644 --- a/dlls/kernel32/nls/gdh.nls +++ b/dlls/kernel32/nls/gdh.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Am Faoilteach" LOCALE_SMONTHNAME2 "An Gearann" LOCALE_SMONTHNAME3 "Am Màrt" diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls index 51e9ad0b868..5e4f7b56385 100644 --- a/dlls/kernel32/nls/gdv.nls +++ b/dlls/kernel32/nls/gdv.nls @@ -104,13 +104,13 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "GBP" LOCALE_SISO3166CTRYNAME "IM" - LOCALE_SISO639LANGNAME "gv" LOCALE_SLANGUAGE "Gaelg (Manninn)" LOCALE_SLIST "," LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "Jerrey-geuree" LOCALE_SMONTHNAME2 "Toshiaght-arree" LOCALE_SMONTHNAME3 "Mayrnt" diff --git a/dlls/kernel32/nls/glc.nls b/dlls/kernel32/nls/glc.nls index 8d960cb16fd..ec9e949808a 100644 --- a/dlls/kernel32/nls/glc.nls +++ b/dlls/kernel32/nls/glc.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "xaneiro" LOCALE_SMONTHNAME2 "febreiro" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/guj.nls b/dlls/kernel32/nls/guj.nls index 1f2b5f77d8e..956743147ad 100644 --- a/dlls/kernel32/nls/guj.nls +++ b/dlls/kernel32/nls/guj.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GUJARATI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "જાન્યુઆરી" LOCALE_SMONTHNAME2 "ફેબ્રુઆરી" LOCALE_SMONTHNAME3 "માર્ચ" diff --git a/dlls/kernel32/nls/heb.nls b/dlls/kernel32/nls/heb.nls index 8f115215025..99f3acc3fc7 100644 --- a/dlls/kernel32/nls/heb.nls +++ b/dlls/kernel32/nls/heb.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd ה־dd בMMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ינואר" LOCALE_SMONTHNAME2 "פברואר" LOCALE_SMONTHNAME3 "מרץ" diff --git a/dlls/kernel32/nls/hin.nls b/dlls/kernel32/nls/hin.nls index a37fb1ab2d9..b300d25063e 100644 --- a/dlls/kernel32/nls/hin.nls +++ b/dlls/kernel32/nls/hin.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_HINDI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "जनवरी" LOCALE_SMONTHNAME2 "फरवरी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/hrv.nls b/dlls/kernel32/nls/hrv.nls index a67d0c4ddef..b321e9176f7 100644 --- a/dlls/kernel32/nls/hrv.nls +++ b/dlls/kernel32/nls/hrv.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "siječanj\0siječnja" LOCALE_SMONTHNAME2 "veljača\0veljače" LOCALE_SMONTHNAME3 "ožujak\0ožujka" diff --git a/dlls/kernel32/nls/hun.nls b/dlls/kernel32/nls/hun.nls index 8a5e41d5c79..c28b8efdb00 100644 --- a/dlls/kernel32/nls/hun.nls +++ b/dlls/kernel32/nls/hun.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy. MMMM d." LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM d." LOCALE_SMONTHNAME1 "január" LOCALE_SMONTHNAME2 "február" LOCALE_SMONTHNAME3 "március" diff --git a/dlls/kernel32/nls/hye.nls b/dlls/kernel32/nls/hye.nls index 6dfe6b5802b..c157c2ae436 100644 --- a/dlls/kernel32/nls/hye.nls +++ b/dlls/kernel32/nls/hye.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Հունվար\0հունվարի" LOCALE_SMONTHNAME2 "Փետրվար\0փետրվարի" LOCALE_SMONTHNAME3 "Մարտ\0մարտի" diff --git a/dlls/kernel32/nls/ind.nls b/dlls/kernel32/nls/ind.nls index be1e701e476..7ca67c3a9aa 100644 --- a/dlls/kernel32/nls/ind.nls +++ b/dlls/kernel32/nls/ind.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januari" LOCALE_SMONTHNAME2 "Februari" LOCALE_SMONTHNAME3 "Maret" diff --git a/dlls/kernel32/nls/isl.nls b/dlls/kernel32/nls/isl.nls index 254ddefe034..a3a5547b8fa 100644 --- a/dlls/kernel32/nls/isl.nls +++ b/dlls/kernel32/nls/isl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ICELANDIC, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "janúar" LOCALE_SMONTHNAME2 "febrúar" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/ita.nls b/dlls/kernel32/nls/ita.nls index 43b9418f2e3..fda73ecc4f8 100644 --- a/dlls/kernel32/nls/ita.nls +++ b/dlls/kernel32/nls/ita.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "gennaio" LOCALE_SMONTHNAME2 "febbraio" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/its.nls b/dlls/kernel32/nls/its.nls index 9307175b4b2..840cdc52d58 100644 --- a/dlls/kernel32/nls/its.nls +++ b/dlls/kernel32/nls/its.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN_SWISS LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "gennaio" LOCALE_SMONTHNAME2 "febbraio" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/ivl.nls b/dlls/kernel32/nls/ivl.nls index c1f689f7e7c..65ada52bc81 100644 --- a/dlls/kernel32/nls/ivl.nls +++ b/dlls/kernel32/nls/ivl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_INVARIANT, SUBLANG_NEUTRAL LOCALE_SLONGDATE "dddd, dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/jpn.nls b/dlls/kernel32/nls/jpn.nls index 8025f6b2658..ea0a9bfbe30 100644 --- a/dlls/kernel32/nls/jpn.nls +++ b/dlls/kernel32/nls/jpn.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "1月" LOCALE_SMONTHNAME2 "2月" LOCALE_SMONTHNAME3 "3月" diff --git a/dlls/kernel32/nls/kan.nls b/dlls/kernel32/nls/kan.nls index 15a45cbf203..aa808a1acfc 100644 --- a/dlls/kernel32/nls/kan.nls +++ b/dlls/kernel32/nls/kan.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ಜನವರೀ" LOCALE_SMONTHNAME2 "ಫೆಬ್ರವರೀ" LOCALE_SMONTHNAME3 "ಮಾರ್ಚ್" diff --git a/dlls/kernel32/nls/kat.nls b/dlls/kernel32/nls/kat.nls index 0d366acc934..6b3f8c8a0b5 100644 --- a/dlls/kernel32/nls/kat.nls +++ b/dlls/kernel32/nls/kat.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GEORGIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy 'წლის' dd MM, dddd" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MM" LOCALE_SMONTHNAME1 "იანვარი" LOCALE_SMONTHNAME2 "თებერვალი" LOCALE_SMONTHNAME3 "მარტი" diff --git a/dlls/kernel32/nls/kkz.nls b/dlls/kernel32/nls/kkz.nls index 65808f53c15..227d3d093f7 100644 --- a/dlls/kernel32/nls/kkz.nls +++ b/dlls/kernel32/nls/kkz.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KAZAK, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy 'ж.'" LOCALE_SMONDECIMALSEP "-" LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 L"\x049b\x0430\x04a3\x0442\x0430\x0440" LOCALE_SMONTHNAME2 L"\x0430\x049b\x043f\x0430\x043d" LOCALE_SMONTHNAME3 "наурыз" diff --git a/dlls/kernel32/nls/knk.nls b/dlls/kernel32/nls/knk.nls index ac09939eafa..8bf8c37a7bd 100644 --- a/dlls/kernel32/nls/knk.nls +++ b/dlls/kernel32/nls/knk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KONKANI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "जानेवारी" LOCALE_SMONTHNAME2 "फेब्रुवारी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/kor.nls b/dlls/kernel32/nls/kor.nls index aceeb83a9c6..5a5a6ed3f4c 100644 --- a/dlls/kernel32/nls/kor.nls +++ b/dlls/kernel32/nls/kor.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_KOREAN LOCALE_SLONGDATE "yyyy'년' M'월' d'일' dddd" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'월' d'일'" LOCALE_SMONTHNAME1 "1월" LOCALE_SMONTHNAME2 "2월" LOCALE_SMONTHNAME3 "3월" diff --git a/dlls/kernel32/nls/kyr.nls b/dlls/kernel32/nls/kyr.nls index a4939e0a56e..fa0a578cde1 100644 --- a/dlls/kernel32/nls/kyr.nls +++ b/dlls/kernel32/nls/kyr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KYRGYZ, SUBLANG_DEFAULT LOCALE_SLONGDATE "d'-'MMMM yyyy'-ж.'" LOCALE_SMONDECIMALSEP "-" LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Январь" LOCALE_SMONTHNAME2 "Февраль" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls index 21332f7df17..f2b2c3687a1 100644 --- a/dlls/kernel32/nls/lth.nls +++ b/dlls/kernel32/nls/lth.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SLONGDATE "yyyy 'm.' MMMM d 'd.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM d 'd.'" LOCALE_SMONTHNAME1 "sausis\0sausio" LOCALE_SMONTHNAME2 "vasaris\0vasario" LOCALE_SMONTHNAME3 "kovas\0kovo" diff --git a/dlls/kernel32/nls/lvi.nls b/dlls/kernel32/nls/lvi.nls index 226e0fd7f38..d561adec9f6 100644 --- a/dlls/kernel32/nls/lvi.nls +++ b/dlls/kernel32/nls/lvi.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, yyyy'. gada 'd. MMMM" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "janvāris" LOCALE_SMONTHNAME2 "februāris" LOCALE_SMONTHNAME3 "marts" diff --git a/dlls/kernel32/nls/mar.nls b/dlls/kernel32/nls/mar.nls index 49e847c6008..39c46d7c3f8 100644 --- a/dlls/kernel32/nls/mar.nls +++ b/dlls/kernel32/nls/mar.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "जानेवारी" LOCALE_SMONTHNAME2 "फेब्रुवारी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/mki.nls b/dlls/kernel32/nls/mki.nls index 979430a78b5..64ae4afa922 100644 --- a/dlls/kernel32/nls/mki.nls +++ b/dlls/kernel32/nls/mki.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MACEDONIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "јануари" LOCALE_SMONTHNAME2 "февруари" LOCALE_SMONTHNAME3 "март" diff --git a/dlls/kernel32/nls/mon.nls b/dlls/kernel32/nls/mon.nls index b67e4b8243a..47787a7288e 100644 --- a/dlls/kernel32/nls/mon.nls +++ b/dlls/kernel32/nls/mon.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MONGOLIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy 'оны' MMMM d" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 L"1\x00a0\x0434\x04af\x0433\x044d\x044d\x0440\x00a0\x0441\x0430\x0440" LOCALE_SMONTHNAME2 "2 дугаар сар" LOCALE_SMONTHNAME3 "3 дугаар сар" diff --git a/dlls/kernel32/nls/msb.nls b/dlls/kernel32/nls/msb.nls index f665bb75316..0a6f18a8a17 100644 --- a/dlls/kernel32/nls/msb.nls +++ b/dlls/kernel32/nls/msb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januari" LOCALE_SMONTHNAME2 "Februari" LOCALE_SMONTHNAME3 "Mac" diff --git a/dlls/kernel32/nls/msl.nls b/dlls/kernel32/nls/msl.nls index 53054c21317..90e877fad1a 100644 --- a/dlls/kernel32/nls/msl.nls +++ b/dlls/kernel32/nls/msl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_MALAYSIA LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januari" LOCALE_SMONTHNAME2 "Februari" LOCALE_SMONTHNAME3 "Mac" diff --git a/dlls/kernel32/nls/nep.nls b/dlls/kernel32/nls/nep.nls index 0f6d0ee1761..7b5ae15e41d 100644 --- a/dlls/kernel32/nls/nep.nls +++ b/dlls/kernel32/nls/nep.nls @@ -103,6 +103,7 @@ STRINGTABLE LANGUAGE LANG_NEPALI, SUBLANG_NEPALI_NEPAL LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "जनवरी" LOCALE_SMONTHNAME2 "फेब्रुअरी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/nlb.nls b/dlls/kernel32/nls/nlb.nls index 9b66b32a768..2fc32e7d26e 100644 --- a/dlls/kernel32/nls/nlb.nls +++ b/dlls/kernel32/nls/nlb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_BELGIAN LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "maart" diff --git a/dlls/kernel32/nls/nld.nls b/dlls/kernel32/nls/nld.nls index 8f28f59960c..6c12aec6792 100644 --- a/dlls/kernel32/nls/nld.nls +++ b/dlls/kernel32/nls/nld.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "maart" diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls index 47c1260d1e6..e7a94931fd2 100644 --- a/dlls/kernel32/nls/nls.nls +++ b/dlls/kernel32/nls/nls.nls @@ -115,6 +115,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "maart" diff --git a/dlls/kernel32/nls/non.nls b/dlls/kernel32/nls/non.nls index e3284041680..6a52f2b514a 100644 --- a/dlls/kernel32/nls/non.nls +++ b/dlls/kernel32/nls/non.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/nor.nls b/dlls/kernel32/nls/nor.nls index f887978aab4..ffe216cd5a8 100644 --- a/dlls/kernel32/nls/nor.nls +++ b/dlls/kernel32/nls/nor.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/pan.nls b/dlls/kernel32/nls/pan.nls index b562e5e6004..d6a17ea7817 100644 --- a/dlls/kernel32/nls/pan.nls +++ b/dlls/kernel32/nls/pan.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_PUNJABI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy dddd" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ਜਨਵਰੀ" LOCALE_SMONTHNAME2 "ਫ਼ਰਵਰੀ" LOCALE_SMONTHNAME3 "ਮਾਰਚ" diff --git a/dlls/kernel32/nls/plk.nls b/dlls/kernel32/nls/plk.nls index 8f0808ce2c7..bac0547bb17 100644 --- a/dlls/kernel32/nls/plk.nls +++ b/dlls/kernel32/nls/plk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "styczeń\0stycznia" LOCALE_SMONTHNAME2 "luty\0lutego" LOCALE_SMONTHNAME3 "marzec\0marca" diff --git a/dlls/kernel32/nls/ptb.nls b/dlls/kernel32/nls/ptb.nls index eb6fc513cb0..6c5199fa572 100644 --- a/dlls/kernel32/nls/ptb.nls +++ b/dlls/kernel32/nls/ptb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN LOCALE_SLONGDATE "dddd, d' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd' de 'MMMM" LOCALE_SMONTHNAME1 "janeiro" LOCALE_SMONTHNAME2 "fevereiro" LOCALE_SMONTHNAME3 "março" diff --git a/dlls/kernel32/nls/ptg.nls b/dlls/kernel32/nls/ptg.nls index ec71704f94e..ae0a843e7d1 100644 --- a/dlls/kernel32/nls/ptg.nls +++ b/dlls/kernel32/nls/ptg.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE LOCALE_SLONGDATE "dddd, d' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd/MM" LOCALE_SMONTHNAME1 "Janeiro" LOCALE_SMONTHNAME2 "Fevereiro" LOCALE_SMONTHNAME3 "Março" diff --git a/dlls/kernel32/nls/rmc.nls b/dlls/kernel32/nls/rmc.nls index 0277b5f5fe3..eebf2ddce8e 100644 --- a/dlls/kernel32/nls/rmc.nls +++ b/dlls/kernel32/nls/rmc.nls @@ -120,6 +120,7 @@ STRINGTABLE LANGUAGE LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND LOCALE_SLONGDATE "dddd, d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "schaner" LOCALE_SMONTHNAME2 "favrer" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/rom.nls b/dlls/kernel32/nls/rom.nls index 8cc965c5674..357293e563c 100644 --- a/dlls/kernel32/nls/rom.nls +++ b/dlls/kernel32/nls/rom.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "ianuarie" LOCALE_SMONTHNAME2 "februarie" LOCALE_SMONTHNAME3 "martie" diff --git a/dlls/kernel32/nls/rus.nls b/dlls/kernel32/nls/rus.nls index fcb55bb80a8..4d14af2c7d7 100644 --- a/dlls/kernel32/nls/rus.nls +++ b/dlls/kernel32/nls/rus.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy 'г.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "Январь\0января" LOCALE_SMONTHNAME2 "Февраль\0февраля" LOCALE_SMONTHNAME3 "Март\0марта" diff --git a/dlls/kernel32/nls/san.nls b/dlls/kernel32/nls/san.nls index 992d80cc188..5fca61335b1 100644 --- a/dlls/kernel32/nls/san.nls +++ b/dlls/kernel32/nls/san.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy dddd" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "जनवरी" LOCALE_SMONTHNAME2 "फरवरी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 033dbc0d7ea..9b74ca12f6d 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA LOCALE_SLONGDATE "yyyy MMMM dd" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "ජනවාරි" LOCALE_SMONTHNAME2 "පෙබරවාරි" LOCALE_SMONTHNAME3 "මාර්තු" diff --git a/dlls/kernel32/nls/sky.nls b/dlls/kernel32/nls/sky.nls index ec04973f9c2..adc363253fc 100644 --- a/dlls/kernel32/nls/sky.nls +++ b/dlls/kernel32/nls/sky.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "január" LOCALE_SMONTHNAME2 "február" LOCALE_SMONTHNAME3 "marec" diff --git a/dlls/kernel32/nls/slv.nls b/dlls/kernel32/nls/slv.nls index 3d0790c0e71..63181e4d0a2 100644 --- a/dlls/kernel32/nls/slv.nls +++ b/dlls/kernel32/nls/slv.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "marec" diff --git a/dlls/kernel32/nls/sqi.nls b/dlls/kernel32/nls/sqi.nls index 7fda7bd589f..c269e16f0eb 100644 --- a/dlls/kernel32/nls/sqi.nls +++ b/dlls/kernel32/nls/sqi.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy-MM-dd" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "janar" LOCALE_SMONTHNAME2 "shkurt" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 348cf405239..4d1049be44b 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "јануар" LOCALE_SMONTHNAME2 "фебруар" LOCALE_SMONTHNAME3 "март" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index 2566b17b489..fb6ba8b178d 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "mart" diff --git a/dlls/kernel32/nls/sve.nls b/dlls/kernel32/nls/sve.nls index 52db021b192..442de8db8a3 100644 --- a/dlls/kernel32/nls/sve.nls +++ b/dlls/kernel32/nls/sve.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH LOCALE_SLONGDATE "'den 'd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "'den 'd MMMM" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/svf.nls b/dlls/kernel32/nls/svf.nls index e92fc6ab175..2e71b98595d 100644 --- a/dlls/kernel32/nls/svf.nls +++ b/dlls/kernel32/nls/svf.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND LOCALE_SLONGDATE "'den 'd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "'den 'd MMMM" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/swk.nls b/dlls/kernel32/nls/swk.nls index b5c32e4b180..30220608cf2 100644 --- a/dlls/kernel32/nls/swk.nls +++ b/dlls/kernel32/nls/swk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SWAHILI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/syr.nls b/dlls/kernel32/nls/syr.nls index 4f84b8dc5e6..9209992d055 100644 --- a/dlls/kernel32/nls/syr.nls +++ b/dlls/kernel32/nls/syr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ܟܢܘܢ ܐܚܪܝ" LOCALE_SMONTHNAME2 "ܫܒܛ" LOCALE_SMONTHNAME3 "ܐܕܪ" diff --git a/dlls/kernel32/nls/tam.nls b/dlls/kernel32/nls/tam.nls index c860016cd0b..7da8a8f964d 100644 --- a/dlls/kernel32/nls/tam.nls +++ b/dlls/kernel32/nls/tam.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_TAMIL, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ஜனவரி" LOCALE_SMONTHNAME2 "பெப்ரவரி" LOCALE_SMONTHNAME3 "மார்ச்" diff --git a/dlls/kernel32/nls/tel.nls b/dlls/kernel32/nls/tel.nls index 6c96d3e0185..1c7b92d375b 100644 --- a/dlls/kernel32/nls/tel.nls +++ b/dlls/kernel32/nls/tel.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "జనవరి" LOCALE_SMONTHNAME2 "ఫిబ్రవరి" LOCALE_SMONTHNAME3 "మార్చి" diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 9ffce8c3295..42ea7c04aaa 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "มกราคม" LOCALE_SMONTHNAME2 "กุมภาพันธ์" LOCALE_SMONTHNAME3 "มีนาคม" diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls index 57184e5f254..8f12d35153d 100644 --- a/dlls/kernel32/nls/trk.nls +++ b/dlls/kernel32/nls/trk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy dddd" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Ocak" LOCALE_SMONTHNAME2 "Şubat" LOCALE_SMONTHNAME3 "Mart" diff --git a/dlls/kernel32/nls/ttt.nls b/dlls/kernel32/nls/ttt.nls index 86236d91e3d..329954fb3c4 100644 --- a/dlls/kernel32/nls/ttt.nls +++ b/dlls/kernel32/nls/ttt.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Гыйнварь" LOCALE_SMONTHNAME2 "Февраль" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls index b5e608015f2..06ba29f808e 100644 --- a/dlls/kernel32/nls/ukr.nls +++ b/dlls/kernel32/nls/ukr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy' р.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Січень\0січня" LOCALE_SMONTHNAME2 "Лютий\0лютого" LOCALE_SMONTHNAME3 "Березень\0березня" diff --git a/dlls/kernel32/nls/urd.nls b/dlls/kernel32/nls/urd.nls index 08e8a8deaef..e44ab6a7ea0 100644 --- a/dlls/kernel32/nls/urd.nls +++ b/dlls/kernel32/nls/urd.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_URDU, SUBLANG_URDU_PAKISTAN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "جنورى" LOCALE_SMONTHNAME2 "فرورى" LOCALE_SMONTHNAME3 "مارچ" diff --git a/dlls/kernel32/nls/uzb.nls b/dlls/kernel32/nls/uzb.nls index 7d0b4a8ac36..fa017079379 100644 --- a/dlls/kernel32/nls/uzb.nls +++ b/dlls/kernel32/nls/uzb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC LOCALE_SLONGDATE "yyyy 'йил' d-MMMM" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d-MMMM" LOCALE_SMONTHNAME1 "Январ" LOCALE_SMONTHNAME2 "Феврал" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/uzl.nls b/dlls/kernel32/nls/uzl.nls index 1989bd7cb74..affd82b483b 100644 --- a/dlls/kernel32/nls/uzl.nls +++ b/dlls/kernel32/nls/uzl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_LATIN LOCALE_SLONGDATE "yyyy 'yil' d-MMMM" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d-MMMM" LOCALE_SMONTHNAME1 "yanvar" LOCALE_SMONTHNAME2 "fevral" LOCALE_SMONTHNAME3 "mart" diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index a2574b6b033..573b0260bd9 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "tháng một" LOCALE_SMONTHNAME2 "tháng hai" LOCALE_SMONTHNAME3 "tháng ba" diff --git a/dlls/kernel32/nls/wal.nls b/dlls/kernel32/nls/wal.nls index e39c5bf4a6c..3723aeb51ef 100644 --- a/dlls/kernel32/nls/wal.nls +++ b/dlls/kernel32/nls/wal.nls @@ -108,6 +108,7 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SLIST ";" LOCALE_SLONGDATE "Li ddd d di MMMM yyyy" LOCALE_SMONDECIMALSEP "," + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "djanvî" LOCALE_SMONTHNAME2 "fevrî" diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls index 2d49998ef5b..720261cd328 100644 --- a/dlls/kernel32/nls/zhh.nls +++ b/dlls/kernel32/nls/zhh.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_SLONGDATE "dddd, d MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls index d8013dcc1c8..2017b87f0c5 100644 --- a/dlls/kernel32/nls/zhi.nls +++ b/dlls/kernel32/nls/zhi.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE LOCALE_SLONGDATE "dddd, d MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "一月" LOCALE_SMONTHNAME2 "二月" LOCALE_SMONTHNAME3 "三月" diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls index 956008dabb0..c9a6f143555 100644 --- a/dlls/kernel32/nls/zhm.nls +++ b/dlls/kernel32/nls/zhm.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_SLONGDATE "dddd, d MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "一月" LOCALE_SMONTHNAME2 "二月" LOCALE_SMONTHNAME3 "三月" -- 2.17.0

2 3

[PATCH] comctl32/button: Improve repainting on WM_SETFOCUS.
by Nikolay Sivov 23 Apr '19

23 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/button.c | 7 ++++++- dlls/comctl32/tests/button.c | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0a8bdf1713..0078bd0fc6 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -815,7 +815,12 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_SETFOCUS: TRACE("WM_SETFOCUS %p\n",hWnd); infoPtr->state |= BST_FOCUS; - paint_button( infoPtr, btn_type, ODA_FOCUS ); + + if (btn_type == BS_OWNERDRAW) + paint_button( infoPtr, btn_type, ODA_FOCUS ); + else + InvalidateRect(hWnd, NULL, FALSE); + if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS); break; diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index e7789dc29a..dd05a98d2d 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -782,12 +782,11 @@ static void test_button_messages(void) set_test_cd_ret(CDRF_DODEFAULT); set_test_cd_state(CDIS_FOCUS); - todo = button[i].style != BS_OWNERDRAW; ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); SetFocus(hwnd); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setfocus, "SetFocus(hwnd) on a button", todo); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setfocus, "SetFocus(hwnd) on a button", FALSE); check_cd_seq(cd_setfocus_type, "SetFocus(hwnd)"); set_test_cd_state(0); -- 2.20.1

1 0

[RFC PATCH 2/2] kernel32: Split A/W implementation of {Get,Write}PrivateProfileString().
by Jactry Zeng 23 Apr '19

23 Apr '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/kernel32/profile.c | 126 +++++++++++++++++++--------------- dlls/kernel32/tests/profile.c | 91 +++++++++++++++++++++--- 2 files changed, 151 insertions(+), 66 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 462d64e5f0..3defaf6bef 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -68,6 +68,7 @@ typedef struct WCHAR *filename; FILETIME LastWriteTime; ENCODING encoding; + BOOL is_unicode; } PROFILE; @@ -149,7 +150,7 @@ static inline void PROFILE_WriteMarker(HANDLE hFile, ENCODING encoding) } } -static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING encoding) +static void PROFILE_WriteLine(HANDLE hFile, WCHAR *szLine, int len, ENCODING encoding, BOOL is_unicode) { char * write_buffer; int write_buffer_len; @@ -160,10 +161,10 @@ static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING e switch (encoding) { case ENCODING_ANSI: - write_buffer_len = WideCharToMultiByte(CP_ACP, 0, szLine, len, NULL, 0, NULL, NULL); + write_buffer_len = WideCharToMultiByte(is_unicode ? CP_ACP : 1252, 0, szLine, len, NULL, 0, NULL, NULL); write_buffer = HeapAlloc(GetProcessHeap(), 0, write_buffer_len); if (!write_buffer) return; - len = WideCharToMultiByte(CP_ACP, 0, szLine, len, write_buffer, write_buffer_len, NULL, NULL); + len = WideCharToMultiByte(is_unicode ? CP_ACP : 1252, 0, szLine, len, write_buffer, write_buffer_len, NULL, NULL); WriteFile(hFile, write_buffer, len, &dwBytesWritten, NULL); HeapFree(GetProcessHeap(), 0, write_buffer); break; @@ -192,7 +193,7 @@ static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING e * * Save a profile tree to a file. */ -static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING encoding ) +static void PROFILE_Save(HANDLE hFile, const PROFILESECTION *section, ENCODING encoding, BOOL is_unicode) { PROFILEKEY *key; WCHAR *buffer, *p; @@ -238,7 +239,7 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING *p++ = '\r'; *p++ = '\n'; } - PROFILE_WriteLine( hFile, buffer, len, encoding ); + PROFILE_WriteLine(hFile, buffer, len, encoding, is_unicode); HeapFree(GetProcessHeap(), 0, buffer); } } @@ -305,7 +306,7 @@ static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len * * Load a profile tree from a file. */ -static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) +static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING *pEncoding, BOOL is_unicode) { void *buffer_base, *pBuffer; WCHAR * szFile; @@ -343,14 +344,14 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) case ENCODING_ANSI: TRACE("ANSI encoding\n"); - len = MultiByteToWideChar(CP_ACP, 0, pBuffer, dwFileSize, NULL, 0); + len = MultiByteToWideChar(is_unicode ? CP_ACP : 1252, 0, pBuffer, dwFileSize, NULL, 0); szFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!szFile) { HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } - MultiByteToWideChar(CP_ACP, 0, pBuffer, dwFileSize, szFile, len); + MultiByteToWideChar(is_unicode ? CP_ACP : 1252, 0, pBuffer, dwFileSize, szFile, len); szEnd = szFile + len; break; case ENCODING_UTF8: @@ -678,7 +679,7 @@ static BOOL PROFILE_FlushFile(void) } TRACE("Saving %s\n", debugstr_w(CurProfile->filename)); - PROFILE_Save( hFile, CurProfile->section, CurProfile->encoding ); + PROFILE_Save(hFile, CurProfile->section, CurProfile->encoding, CurProfile->is_unicode); if(GetFileTime(hFile, NULL, NULL, &LastWriteTime)) CurProfile->LastWriteTime=LastWriteTime; CloseHandle( hFile ); @@ -729,7 +730,7 @@ static BOOL is_not_current(FILETIME * ft) * * Open a profile file, checking the cached file first. */ -static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) +static BOOL PROFILE_Open(LPCWSTR filename, BOOL write_access, BOOL is_unicode) { WCHAR buffer[MAX_PATH]; HANDLE hFile = INVALID_HANDLE_VALUE; @@ -750,6 +751,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) MRUProfile[i]->section=NULL; MRUProfile[i]->filename=NULL; MRUProfile[i]->encoding=ENCODING_ANSI; + MRUProfile[i]->is_unicode = is_unicode; ZeroMemory(&MRUProfile[i]->LastWriteTime, sizeof(FILETIME)); } @@ -786,7 +788,8 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) for(i=0;i<N_CACHED_PROFILES;i++) { - if ((MRUProfile[i]->filename && !strcmpiW( buffer, MRUProfile[i]->filename ))) + if ((MRUProfile[i]->filename && !strcmpiW(buffer, MRUProfile[i]->filename) && + (MRUProfile[i]->is_unicode == is_unicode))) { TRACE("MRU Filename: %s, new filename: %s\n", debugstr_w(MRUProfile[i]->filename), debugstr_w(buffer)); if(i) @@ -810,7 +813,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) TRACE("(%s): already opened, needs refreshing (mru=%d)\n", debugstr_w(buffer), i); PROFILE_Free(CurProfile->section); - CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding); + CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding, CurProfile->is_unicode); CurProfile->LastWriteTime = LastWriteTime; } CloseHandle(hFile); @@ -840,7 +843,8 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) if (hFile != INVALID_HANDLE_VALUE) { - CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding); + CurProfile->is_unicode = is_unicode; + CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding, CurProfile->is_unicode); GetFileTime(hFile, NULL, NULL, &CurProfile->LastWriteTime); CloseHandle(hFile); } @@ -1062,6 +1066,19 @@ static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, return TRUE; } +static LPWSTR c2w(LPCSTR string) +{ + INT lenW; + LPWSTR stringW = NULL; + + if (!string) + return stringW; + + lenW = MultiByteToWideChar(1252, 0, string, -1, NULL, 0); + if ((stringW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)))) + MultiByteToWideChar(1252, 0, string, -1, stringW, lenW); + return stringW; +} /********************* API functions **********************************/ @@ -1083,13 +1100,13 @@ UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val ) } static int get_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, - LPWSTR buffer, UINT len, LPCWSTR filename) + LPWSTR buffer, UINT len, LPCWSTR filename, BOOL is_unicode) { int ret; LPWSTR defval_tmp = NULL; - TRACE("(%s, %s, %s, %p, %u, %s)\n", debugstr_w(section), debugstr_w(entry), - debugstr_w(def_val), buffer, len, debugstr_w(filename)); + TRACE("(%s, %s, %s, %p, %u, %s, %d)\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(def_val), buffer, len, debugstr_w(filename), is_unicode); /* strip any trailing ' ' of def_val. */ if (def_val) @@ -1112,7 +1129,7 @@ static int get_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR de RtlEnterCriticalSection(&PROFILE_CritSect); - if (PROFILE_Open(filename, FALSE)) + if (PROFILE_Open(filename, FALSE, is_unicode)) { if (section == NULL) ret = PROFILE_GetSectionNames(buffer, len); @@ -1145,7 +1162,7 @@ INT WINAPI GetPrivateProfileStringW(LPCWSTR section, LPCWSTR entry, UINT len, LPCWSTR filename) { return get_private_profile_string(section, entry, def_val, buffer, - len, filename); + len, filename, TRUE); } /*********************************************************************** @@ -1155,39 +1172,35 @@ INT WINAPI GetPrivateProfileStringA(LPCSTR section, LPCSTR entry, LPCSTR def_val, LPSTR buffer, UINT len, LPCSTR filename) { - UNICODE_STRING sectionW, entryW, def_valW, filenameW; - LPWSTR bufferW; + UNICODE_STRING filenameW; + LPWSTR bufferW, sectionW, entryW, def_valW; INT retW, ret = 0; bufferW = buffer ? HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)) : NULL; - if (section) RtlCreateUnicodeStringFromAsciiz(&sectionW, section); - else sectionW.Buffer = NULL; - if (entry) RtlCreateUnicodeStringFromAsciiz(&entryW, entry); - else entryW.Buffer = NULL; - if (def_val) RtlCreateUnicodeStringFromAsciiz(&def_valW, def_val); - else def_valW.Buffer = NULL; + sectionW = c2w(section); + entryW = c2w(entry); + def_valW = c2w(def_val); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retW = get_private_profile_string(sectionW.Buffer, entryW.Buffer, - def_valW.Buffer, bufferW, len, - filenameW.Buffer); + retW = get_private_profile_string(sectionW, entryW, def_valW, bufferW, len, + filenameW.Buffer, FALSE); if (len && buffer) { if (retW) { - ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW, buffer, len - 1, NULL, NULL); + ret = WideCharToMultiByte(1252, 0, bufferW, retW, buffer, len - 1, NULL, NULL); if (!ret) ret = len - 1; } buffer[ret] = 0; } - RtlFreeUnicodeString(&sectionW); - RtlFreeUnicodeString(&entryW); - RtlFreeUnicodeString(&def_valW); RtlFreeUnicodeString(&filenameW); HeapFree(GetProcessHeap(), 0, bufferW); + HeapFree(GetProcessHeap(), 0, sectionW); + HeapFree(GetProcessHeap(), 0, entryW); + HeapFree(GetProcessHeap(), 0, def_valW); return ret; } @@ -1298,7 +1311,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) + if (PROFILE_Open(filename, FALSE, TRUE)) ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1369,23 +1382,23 @@ INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) } static BOOL write_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR string, - LPCWSTR filename) + LPCWSTR filename, BOOL is_unicode) { BOOL ret = FALSE; - TRACE("(%s, %s, %s, %s)\n", debugstr_w(section), debugstr_w(entry), - debugstr_w(string), debugstr_w(filename)); + TRACE("(%s, %s, %s, %s, %d)\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(string), debugstr_w(filename), is_unicode); RtlEnterCriticalSection(&PROFILE_CritSect); if (!section && !entry && !string) /* documented "file flush" case */ { - if (!filename || PROFILE_Open(filename, TRUE)) + if (!filename || PROFILE_Open(filename, TRUE, is_unicode)) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open(filename, TRUE)) + else if (PROFILE_Open(filename, TRUE, is_unicode)) { if (!section) { SetLastError(ERROR_FILE_NOT_FOUND); @@ -1406,7 +1419,7 @@ BOOL WINAPI WritePrivateProfileStringW(LPCWSTR section, LPCWSTR entry, LPCWSTR string, LPCWSTR filename) { return write_private_profile_string(section, entry, string, - filename); + filename, TRUE); } /*********************************************************************** @@ -1415,23 +1428,22 @@ BOOL WINAPI WritePrivateProfileStringW(LPCWSTR section, LPCWSTR entry, BOOL WINAPI DECLSPEC_HOTPATCH WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR string, LPCSTR filename ) { - UNICODE_STRING sectionW, entryW, stringW, filenameW; + UNICODE_STRING filenameW; + LPWSTR sectionW, entryW, stringW; BOOL ret; - if (section) RtlCreateUnicodeStringFromAsciiz(&sectionW, section); - else sectionW.Buffer = NULL; - if (entry) RtlCreateUnicodeStringFromAsciiz(&entryW, entry); - else entryW.Buffer = NULL; - if (string) RtlCreateUnicodeStringFromAsciiz(&stringW, string); - else stringW.Buffer = NULL; + sectionW = c2w(section); + entryW = c2w(entry); + stringW = c2w(string); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - ret = write_private_profile_string(sectionW.Buffer, entryW.Buffer, - stringW.Buffer, filenameW.Buffer); - RtlFreeUnicodeString(&sectionW); - RtlFreeUnicodeString(&entryW); - RtlFreeUnicodeString(&stringW); + ret = write_private_profile_string(sectionW, entryW, stringW, + filenameW.Buffer, FALSE); + + HeapFree(GetProcessHeap(), 0, sectionW); + HeapFree(GetProcessHeap(), 0, entryW); + HeapFree(GetProcessHeap(), 0, stringW); RtlFreeUnicodeString(&filenameW); return ret; } @@ -1449,12 +1461,12 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, if (!section && !string) { - if (!filename || PROFILE_Open( filename, TRUE )) + if (!filename || PROFILE_Open(filename, TRUE, TRUE)) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open( filename, TRUE )) { + else if (PROFILE_Open(filename, TRUE, TRUE)) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); } else { @@ -1576,7 +1588,7 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) + if (PROFILE_Open(filename, FALSE, TRUE)) ret = PROFILE_GetSectionNames(buffer, size); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1631,7 +1643,7 @@ BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) { + if (PROFILE_Open(filename, FALSE, TRUE)) { PROFILEKEY *k = PROFILE_Find ( &CurProfile->section, section, key, FALSE, FALSE); if (k) { TRACE("value (at %p): %s\n", k->value, debugstr_w(k->value)); @@ -1751,7 +1763,7 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, TRUE )) { + if (PROFILE_Open(filename, TRUE, TRUE)) { ret = PROFILE_SetString( section, key, outstring, FALSE); if (ret) ret = PROFILE_FlushFile(); } diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 8a0089bb1b..293d009eb8 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -592,7 +592,11 @@ static void test_GetPrivateProfileString(const char *content, const char *descri empty string and check for modification */ CHAR emptystr[MAX_PATH] = ""; LPSTR tempfile; - + CHAR expected_val[MAX_PATH]; + WCHAR bufW[MAX_PATH], expected_valW[MAX_PATH]; + static const WCHAR section_schineseW[] = {0xe6,0xae,0xb5,0x31,0}; + static const WCHAR name5W[] = {'n','a','m','e','5',0}; + static const WCHAR filenameW[] = {'.','\\','w','i','n','e','t','e','s','t','.','i','n','i',0}; static const char filename[] = ".\\winetest.ini"; trace("test_GetPrivateProfileStringA: %s\n", descript); @@ -620,12 +624,12 @@ static void test_GetPrivateProfileString(const char *content, const char *descri lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(NULL, "name1", "default", buf, MAX_PATH, filename); - ok(ret == 18 || - broken(ret == 19), /* Win9x and WinME */ - "Expected 18, got %d\n", ret); - len = lstrlenA("section1") + sizeof(CHAR) + lstrlenA("section2") + 2 * sizeof(CHAR); - ok(!memcmp(buf, "section1\0section2\0\0", len), - "Expected \"section1\\0section2\\0\\0\", got \"%s\"\n", buf); + ok(ret == 23 || + broken(ret == 24), /* Win9x and WinME */ + "Expected 23, got %d\n", ret); + len = lstrlenA("section1") + lstrlenA("section2") + lstrlenA("\xe6\xae\xb5\x31") + 4 * sizeof(CHAR); + ok(!memcmp(buf, "section1\0section2\0\xe6\xae\xb5\x31\0\0", len), + "Expected \"section1\\0section2\\0\xe6\xae\xb5\x31\\0\\0\", got \"%s\"\n", buf); /* lpAppName is empty */ memset(buf, 0xc, sizeof(buf)); @@ -827,6 +831,42 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ok(ret == 0, "Expected 0, got %d\n", ret); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + memset(buf, 0xc, sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("\xe6\xae\xb5\x31", "name5", "default", + buf, MAX_PATH, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "\xe9\x85\x92\x2e"), + "Expected \"\xe9\x85\x92\x2e\", got \"%s\"\n", buf); + + memset(buf, 0xc,sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("\xe6\xae\xb5\x31", "\xe5\xa7\x93", "default", + buf, MAX_PATH, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "\xe6\x9b\xbe\x2e"), + "Expected \"\xe6\x9b\xbe\x2e\", got \"%s\"\n", buf); + + memset(buf, 0xc, sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("\xe6\xae\xb5\x31", "name6", "default", + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "\xd7\x99\xd7\x99\xd7\x9f\x2e"), + "Expected \"\xd7\x99\xd7\x99\xd7\x9f\x2e\", got \"%s\"\n", buf); + + + memset(bufW, 0xc, sizeof(bufW)); + lstrcpyA(expected_val, "\xe9\x85\x92\x2e"); + len = MultiByteToWideChar(CP_ACP, 0, expected_val, -1, expected_valW, MAX_PATH) - 1; + ret = GetPrivateProfileStringW(section_schineseW, name5W, NULL, + bufW, MAX_PATH, filenameW); + ok(ret == len || + (ret == 0 && bufW[0] == '\0') /* non-English */, "Expected %d, got %d\n", len, ret); + if (ret) + ok(!lstrcmpW(bufW, expected_valW), "Expected \"%s\", got \"%s\"\n", + wine_dbgstr_w(expected_valW), wine_dbgstr_w(bufW)); + /* lpAppName is NULL, not enough room for final section name */ memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); @@ -1171,6 +1211,31 @@ static void test_WritePrivateProfileString(void) "key1=string1" /* 14 bytes */ , 59)), "File doesn't match\n"); DeleteFileA(path); + + data = "[section1]\r\n" + "name=\xe9\x85\x92\x2e\r\n"; + GetTempFileNameA(temp, "wine", 0, path); + ret = WritePrivateProfileStringA("section1", "name", "\xe9\x85\x92\x2e", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + data = "[section1]\r\n" + "name=\xe9\x85\x92\x2e\r\n" + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r\n"; + ret = WritePrivateProfileStringA("section1", "\xe5\xa7\x93", "\xe6\x9b\xbe\x2e", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + data = "[section1]\r\n" + "name=\xe9\x85\x92\x2e\r\n" + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r\n" + "[\xe6\xae\xb5\x31]\r\n" + "name2=\xe6\x9b\xbe\x2e\r\n"; + ret = WritePrivateProfileStringA("\xe6\xae\xb5\x31", "name2", "\xe6\x9b\xbe\x2e", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + DeleteFileA(path); } START_TEST(profile) @@ -1189,7 +1254,11 @@ START_TEST(profile) "name2=\"val2\"\r\n" "name3\r\n" "name4=a\r\n" - "[section2]\r\n", + "[section2]\r\n" + "[\xe6\xae\xb5\x31]\r\n" /* Simplified Chinese in UTF-8 */ + "name5=\xe9\x85\x92\x2e\r\n" /* Simplified Chinese in UTF-8 */ + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r\n" /* Simplified Chinese in UTF-8 */ + "name6=\xd7\x99\xd7\x99\xd7\x9f\x2e\r\n", /* Hebrew in UTF-8 */ "CR+LF"); test_GetPrivateProfileString( "[section1]\r" @@ -1197,7 +1266,11 @@ START_TEST(profile) "name2=\"val2\"\r" "name3\r" "name4=a\r" - "[section2]\r", + "[section2]\r" + "[\xe6\xae\xb5\x31]\r" /* Simplified Chinese in UTF-8 */ + "name5=\xe9\x85\x92\x2e\r" /* Simplified Chinese in UTF-8 */ + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r" /* Simplified Chinese in UTF-8 */ + "name6=\xd7\x99\xd7\x99\xd7\x9f\x2e\r", /* Hebrew in UTF-8 */ "CR only"); test_WritePrivateProfileString(); } -- 2.20.1

1 0

[PATCH 1/5] dbgeng: Implement ReadVirtual().
by Nikolay Sivov 23 Apr '19

23 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/dbgeng.c | 23 +++++++++++++++++++++-- dlls/dbgeng/tests/dbgeng.c | 27 ++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 1acfe0b318..d7f8191858 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -725,9 +725,28 @@ static ULONG STDMETHODCALLTYPE debugdataspaces_Release(IDebugDataSpaces *iface) static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); + static struct target_process *target; + HRESULT hr = S_OK; + SIZE_T length; - return E_NOTIMPL; + TRACE("%p, %s, %p, %u, %p.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (ReadProcessMemory(target->handle, (const void *)(ULONG_PTR)offset, buffer, buffer_size, &length)) + { + if (read_len) + *read_len = length; + } + else + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to read process memory %#x.\n", hr); + } + + return hr; } static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 2a2dd3ad06..c8906c9048 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -322,14 +322,15 @@ todo_wine static void test_module_information(void) { static const char *event_name = "dbgeng_test_event"; - unsigned int loaded, unloaded, index; + unsigned int loaded, unloaded, index, length; DEBUG_MODULE_PARAMETERS params[2]; + IDebugDataSpaces *dataspaces; PROCESS_INFORMATION info; IDebugSymbols *symbols; IDebugControl *control; + ULONG64 bases[2], base; IDebugClient *client; - ULONG64 bases[2]; - ULONG64 base; + char buffer[64]; HANDLE event; HRESULT hr; BOOL ret; @@ -343,6 +344,9 @@ static void test_module_information(void) hr = client->lpVtbl->QueryInterface(client, &IID_IDebugSymbols, (void **)&symbols); ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + hr = client->lpVtbl->QueryInterface(client, &IID_IDebugDataSpaces, (void **)&dataspaces); + ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + event = CreateEventA(NULL, FALSE, FALSE, event_name); ok(event != NULL, "Failed to create event.\n"); @@ -419,6 +423,22 @@ static void test_module_information(void) hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, NULL, loaded, params); ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + /* Read memory. */ + base = 0; + hr = symbols->lpVtbl->GetModuleByIndex(symbols, 0, &base); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!base, "Unexpected module base.\n"); + + hr = dataspaces->lpVtbl->ReadVirtual(dataspaces, base, buffer, sizeof(buffer), &length); + ok(hr == S_OK, "Failed to read process memory, hr %#x.\n", hr); + ok(length == sizeof(buffer), "Unexpected length %u.\n", length); + ok(buffer[0] == 'M' && buffer[1] == 'Z', "Unexpected contents.\n"); + + memset(buffer, 0, sizeof(buffer)); + hr = dataspaces->lpVtbl->ReadVirtual(dataspaces, base, buffer, sizeof(buffer), NULL); + ok(hr == S_OK, "Failed to read process memory, hr %#x.\n", hr); + ok(buffer[0] == 'M' && buffer[1] == 'Z', "Unexpected contents.\n"); + hr = client->lpVtbl->DetachProcesses(client); ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); @@ -431,6 +451,7 @@ static void test_module_information(void) client->lpVtbl->Release(client); control->lpVtbl->Release(control); symbols->lpVtbl->Release(symbols); + dataspaces->lpVtbl->Release(dataspaces); } static void target_proc(const char *event_name, const char *event_ready_name) -- 2.20.1

1 4

[PATCHv2] msvcrt: Implement the unprefixed logb/logbf/logbl functions for msvcr120/ucrtbase
by Martin Storsjo 23 Apr '19

23 Apr '19

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Moved the reused MSVCRT__logbf function into an ifdef block that always is built for msvcr >= 120, even for i386. --- .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 37 +++++++++++++------ dlls/ucrtbase/ucrtbase.spec | 6 +-- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index a9deec8e48..75ecaf1eff 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -276,9 +276,9 @@ @ cdecl log2(double) ucrtbase.log2 @ cdecl log2f(float) ucrtbase.log2f @ cdecl log2l(double) ucrtbase.log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) ucrtbase.logb +@ cdecl logbf(float) ucrtbase.logbf +@ cdecl logbl(double) ucrtbase.logbl @ cdecl -arch=arm,x86_64,arm64 logf(float) ucrtbase.logf @ cdecl lrint(double) ucrtbase.lrint @ cdecl lrintf(float) ucrtbase.lrintf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 618b9bccbc..a573c91fdc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2265,9 +2265,9 @@ @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) MSVCR120_logb +@ cdecl logbf(float) MSVCR120_logbf +@ cdecl logbl(double) MSVCR120_logbl @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl lrint(double) MSVCR120_lrint @ cdecl lrintf(float) MSVCR120_lrintf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 26ffaf7743..a9c21cb978 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1928,9 +1928,9 @@ @ cdecl log2(double) msvcr120.log2 @ cdecl log2f(float) msvcr120.log2f @ cdecl log2l(double) msvcr120.log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) msvcr120.logb +@ cdecl logbf(float) msvcr120.logbf +@ cdecl logbl(double) msvcr120.logbl @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) msvcr120.longjmp @ cdecl lrint(double) msvcr120.lrint @ cdecl lrintf(float) msvcr120.lrintf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 21f1f9b9b2..f5ff8ef204 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -157,6 +157,17 @@ float CDECL MSVCRT__nextafterf( float num, float next ) return nextafterf( num, next ); } +/********************************************************************* + * _logbf (MSVCRT.@) + */ +float CDECL MSVCRT__logbf( float num ) +{ + float ret = logbf(num); + if (isnan(num)) math_error(_DOMAIN, "_logbf", num, 0, ret); + else if (!num) math_error(_SING, "_logbf", num, 0, ret); + return ret; +} + #endif #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) @@ -179,17 +190,6 @@ INT CDECL MSVCRT__isnanf( float num ) return isnan(num) != 0; } -/********************************************************************* - * _logbf (MSVCRT.@) - */ -float CDECL MSVCRT__logbf( float num ) -{ - float ret = logbf(num); - if (isnan(num)) math_error(_DOMAIN, "_logbf", num, 0, ret); - else if (!num) math_error(_SING, "_logbf", num, 0, ret); - return ret; -} - /********************************************************************* * MSVCRT_acosf (MSVCRT.@) */ @@ -3499,4 +3499,19 @@ int CDECL MSVCR120_ilogbl(LDOUBLE x) return MSVCR120_ilogb(x); } +double CDECL MSVCR120_logb(double x) +{ + return MSVCRT__logb(x); +} + +float CDECL MSVCR120_logbf(float x) +{ + return MSVCRT__logbf(x); +} + +LDOUBLE CDECL MSVCR120_logbl(LDOUBLE x) +{ + return MSVCR120_logb(x); +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1866f1b8b0..99dd8fd08f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2398,9 +2398,9 @@ @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) MSVCR120_logb +@ cdecl logbf(float) MSVCR120_logbf +@ cdecl logbl(double) MSVCR120_logbl @ cdecl -arch=arm,x86_64,arm64 logf(float) MSVCRT_logf @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl lrint(double) MSVCR120_lrint -- 2.17.1

1 0

[PATCH] msvcrt: Implement the unprefixed logb/logbf/logbl functions for msvcr120/ucrtbase
by Martin Storsjo 23 Apr '19

23 Apr '19

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- .../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +++--- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index a9deec8e48..75ecaf1eff 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -276,9 +276,9 @@ @ cdecl log2(double) ucrtbase.log2 @ cdecl log2f(float) ucrtbase.log2f @ cdecl log2l(double) ucrtbase.log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) ucrtbase.logb +@ cdecl logbf(float) ucrtbase.logbf +@ cdecl logbl(double) ucrtbase.logbl @ cdecl -arch=arm,x86_64,arm64 logf(float) ucrtbase.logf @ cdecl lrint(double) ucrtbase.lrint @ cdecl lrintf(float) ucrtbase.lrintf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 618b9bccbc..a573c91fdc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2265,9 +2265,9 @@ @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) MSVCR120_logb +@ cdecl logbf(float) MSVCR120_logbf +@ cdecl logbl(double) MSVCR120_logbl @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl lrint(double) MSVCR120_lrint @ cdecl lrintf(float) MSVCR120_lrintf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 26ffaf7743..a9c21cb978 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1928,9 +1928,9 @@ @ cdecl log2(double) msvcr120.log2 @ cdecl log2f(float) msvcr120.log2f @ cdecl log2l(double) msvcr120.log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) msvcr120.logb +@ cdecl logbf(float) msvcr120.logbf +@ cdecl logbl(double) msvcr120.logbl @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) msvcr120.longjmp @ cdecl lrint(double) msvcr120.lrint @ cdecl lrintf(float) msvcr120.lrintf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 21f1f9b9b2..e4dbb0d882 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3499,4 +3499,19 @@ int CDECL MSVCR120_ilogbl(LDOUBLE x) return MSVCR120_ilogb(x); } +double CDECL MSVCR120_logb(double x) +{ + return MSVCRT__logb(x); +} + +float CDECL MSVCR120_logbf(float x) +{ + return MSVCRT__logbf(x); +} + +LDOUBLE CDECL MSVCR120_logbl(LDOUBLE x) +{ + return MSVCR120_logb(x); +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1866f1b8b0..99dd8fd08f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2398,9 +2398,9 @@ @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) MSVCR120_logb +@ cdecl logbf(float) MSVCR120_logbf +@ cdecl logbl(double) MSVCR120_logbl @ cdecl -arch=arm,x86_64,arm64 logf(float) MSVCRT_logf @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl lrint(double) MSVCR120_lrint -- 2.17.1

2 1

[PATCH 5/7] winemac.drv: Add macdrv_get_monitors() helper.
by Zhiyi Zhang 23 Apr '19

23 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 108 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 18 +++++++ 2 files changed, 126 insertions(+) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index d95cda59c9..0005e2ac37 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -343,3 +343,111 @@ void macdrv_free_adapters(struct macdrv_adapter* adapters) { free(adapters); } + +/*********************************************************************** + * macdrv_get_monitors + * + * Get a list of monitors under adapter_id. The first monitor is primary if adapter is primary. + * Call macdrv_free_monitors() when you are done using the data. + * + * Return -1 on failure with parameters unchanged. + */ +int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** new_monitors, int* count) +{ + struct macdrv_monitor* monitors = NULL; + struct macdrv_monitor* realloc_monitors; + struct macdrv_display* displays = NULL; + CGDirectDisplayID display_ids[16]; + uint32_t display_id_count; + int primary_index = 0; + int monitor_count = 0; + int display_count; + int capacity; + int i, j; + int ret = -1; + + /* 2 should be enough for most cases */ + capacity = 2; + monitors = calloc(capacity, sizeof(*monitors)); + if (!monitors) + return -1; + + /* Report an inactive monitor */ + if (!CGDisplayIsActive(adapter_id) && !CGDisplayIsInMirrorSet(adapter_id)) + { + strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor_count++; + } + /* Report active monitor and mirrored monitors in the same mirroring set */ + else + { + if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) + != kCGErrorSuccess) + goto fail; + + if (macdrv_get_displays(&displays, &display_count)) + goto fail; + + for (i = 0; i < display_id_count; i++) + { + if (display_ids[i] != adapter_id && CGDisplayMirrorsDisplay(display_ids[i]) != adapter_id) + continue; + + /* Find and fill in monitor info */ + for (j = 0; j < display_count; j++) + { + if (displays[i].displayID == display_ids[j] + || CGDisplayMirrorsDisplay(display_ids[i]) == displays[j].displayID) + { + /* Allocate more space if needed */ + if (monitor_count >= capacity) + { + capacity *= 2; + realloc_monitors = realloc(monitors, sizeof(*monitors) * capacity); + if (!realloc_monitors) + goto fail; + monitors = realloc_monitors; + } + + if (!primary_index && CGDisplayIsMain(display_ids[j])) + primary_index = monitor_count; + + strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; + monitors[monitor_count].rc_monitor = displays[j].frame; + monitors[monitor_count].rc_work = displays[j].work_frame; + monitor_count++; + } + } + + /* Make sure the first monitor on primary adapter is primary */ + if (primary_index) + { + struct macdrv_monitor tmp; + tmp = monitors[0]; + monitors[0] = monitors[primary_index]; + monitors[primary_index] = tmp; + } + } + } + + *new_monitors = monitors; + *count = monitor_count; + ret = 0; +fail: + macdrv_free_displays(displays); + if (ret) + free(monitors); + return ret; +} + +/*********************************************************************** + * macdrv_free_monitors + * + * Free an monitor list allocated from macdrv_get_monitors() + */ +void macdrv_free_monitors(struct macdrv_monitor* monitors) +{ + free(monitors); +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index a57b94c125..8997131f1e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -261,6 +261,9 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) /* Used DISPLAY_DEVICE.StateFlags for adapters */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 +/* Used DISPLAY_DEVICE.StateFlags for monitors */ +#define DISPLAY_DEVICE_ACTIVE 0x00000001 +#define DISPLAY_DEVICE_ATTACHED 0x00000002 /* Represent a physical GPU in the PCI slots */ struct macdrv_gpu @@ -285,6 +288,19 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) uint32_t state_flags; }; +/* Represent a monitor in EnumDisplayDevices context */ +struct macdrv_monitor +{ + /* Name, in UTF-8 encoding */ + char name[128]; + /* as RcMonitor in MONITORINFO struct after conversion by rect_from_cgrect */ + CGRect rc_monitor; + /* as RcWork in MONITORINFO struct after conversion by rect_from_cgrect */ + CGRect rc_work; + /* StateFlags in DISPLAY_DEVICE struct */ + uint32_t state_flags; +}; + extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN; extern int macdrv_set_display_mode(const struct macdrv_display* display, @@ -293,6 +309,8 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, extern void macdrv_free_gpus(struct macdrv_gpu* gpus) DECLSPEC_HIDDEN; extern int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** adapters, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_adapters(struct macdrv_adapter* adapters) DECLSPEC_HIDDEN; +extern int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** monitors, int* count) DECLSPEC_HIDDEN; +extern void macdrv_free_monitors(struct macdrv_monitor* monitors) DECLSPEC_HIDDEN; /* event */ -- 2.15.2 (Apple Git-101.1)

2 2

[PATCH] user32: make LoadString[AW] patchable
by Vlad Bespalov 23 Apr '19

23 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46626 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Vlad Bespalov <vlad.botanic(a)gmail.com> --- dlls/user32/resource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 83442d85db..8dad3d53d5 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -234,7 +236,7 @@ BOOL WINAPI DestroyAcceleratorTable( HACCEL handle ) /********************************************************************** * LoadStringW (USER32.@) */ -INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, +INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, LPWSTR buffer, INT buflen ) { HGLOBAL hmem; @@ -289,7 +291,7 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, /********************************************************************** * LoadStringA (USER32.@) */ -INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) +INT WINAPI DECLSPEC_HOTPATCH LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) { HGLOBAL hmem; HRSRC hrsrc; -- 2.20.1

3 3

[PATCH 1/2] ntdll/tests: Add some tests for unloaded modules traces.
by Nikolay Sivov 23 Apr '19

23 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 147 ++++++++++++++++++++++++----------- 1 file changed, 102 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3b3f72f07d..d2e0317315 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -56,6 +56,21 @@ static NTSTATUS (WINAPI *pNtClose)(HANDLE); static NTSTATUS (WINAPI *pNtSuspendProcess)(HANDLE process); static NTSTATUS (WINAPI *pNtResumeProcess)(HANDLE process); +#define RTL_UNLOAD_EVENT_TRACE_NUMBER 64 + +typedef struct _RTL_UNLOAD_EVENT_TRACE +{ + void *BaseAddress; + SIZE_T SizeOfImage; + ULONG Sequence; + ULONG TimeDateStamp; + ULONG CheckSum; + WCHAR ImageName[32]; +} RTL_UNLOAD_EVENT_TRACE, *PRTL_UNLOAD_EVENT_TRACE; + +static RTL_UNLOAD_EVENT_TRACE *(WINAPI *pRtlGetUnloadEventTrace)(void); +static void (WINAPI *pRtlGetUnloadEventTraceEx)(ULONG **element_size, ULONG **element_count, void **event_trace); + #if defined(__x86_64__) typedef struct { @@ -3325,6 +3340,53 @@ static void test_suspend_process(void) CloseHandle(event2); } +static void test_unload_trace(void) +{ + static const WCHAR imageW[] = {'m','s','x','m','l','3','.','d','l','l',0}; + RTL_UNLOAD_EVENT_TRACE *unload_trace, *ptr; + ULONG *element_size, *element_count, size; + BOOL found = FALSE; + HMODULE hmod; + + unload_trace = pRtlGetUnloadEventTrace(); +todo_wine + ok(unload_trace != NULL, "Failed to get unload events pointer.\n"); + + if (pRtlGetUnloadEventTraceEx) + { + ptr = NULL; + pRtlGetUnloadEventTraceEx(&element_size, &element_count, (void **)&ptr); + todo_wine { + ok(*element_size >= sizeof(*ptr), "Unexpected element size.\n"); + ok(*element_count == RTL_UNLOAD_EVENT_TRACE_NUMBER, "Unexpected trace element count %u.\n", *element_count); + ok(ptr != NULL, "Unexpected pointer %p.\n", ptr); + } + size = *element_size; + } + else + size = sizeof(*unload_trace); + + hmod = LoadLibraryA("msxml3.dll"); + ok(hmod != NULL, "Failed to load library.\n"); + FreeLibrary(hmod); + +if (unload_trace) +{ + ptr = unload_trace; + while (ptr->BaseAddress != NULL) + { + if (!lstrcmpW(imageW, ptr->ImageName)) + { + found = TRUE; + break; + } + ptr = (RTL_UNLOAD_EVENT_TRACE *)((char *)ptr + size); + } +} +todo_wine + ok(found, "Unloaded module wasn't found.\n"); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3346,29 +3408,28 @@ START_TEST(exception) return; } - pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); - pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); - pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); - pNtClose = (void *)GetProcAddress( hntdll, "NtClose" ); - pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); - pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); - pRtlCaptureContext = (void *)GetProcAddress( hntdll, "RtlCaptureContext" ); - pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" ); - pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, - "RtlAddVectoredExceptionHandler" ); - pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, - "RtlRemoveVectoredExceptionHandler" ); - pRtlAddVectoredContinueHandler = (void *)GetProcAddress( hntdll, - "RtlAddVectoredContinueHandler" ); - pRtlRemoveVectoredContinueHandler = (void *)GetProcAddress( hntdll, - "RtlRemoveVectoredContinueHandler" ); - pNtQueryInformationProcess = (void*)GetProcAddress( hntdll, - "NtQueryInformationProcess" ); - pNtSetInformationProcess = (void*)GetProcAddress( hntdll, - "NtSetInformationProcess" ); +#define X(f) p##f = (void*)GetProcAddress(hntdll, #f) + X(NtGetContextThread); + X(NtSetContextThread); + X(NtReadVirtualMemory); + X(NtClose); + X(RtlUnwind); + X(RtlRaiseException); + X(RtlCaptureContext); + X(NtTerminateProcess); + X(RtlAddVectoredExceptionHandler); + X(RtlRemoveVectoredExceptionHandler); + X(RtlAddVectoredContinueHandler); + X(RtlRemoveVectoredContinueHandler); + X(NtQueryInformationProcess); + X(NtSetInformationProcess); + X(NtSuspendProcess); + X(NtResumeProcess); + X(RtlGetUnloadEventTrace); + X(RtlGetUnloadEventTraceEx); +#undef X + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); - pNtSuspendProcess = (void *)GetProcAddress( hntdll, "NtSuspendProcess" ); - pNtResumeProcess = (void *)GetProcAddress( hntdll, "NtResumeProcess" ); #ifdef __i386__ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -3455,31 +3516,26 @@ START_TEST(exception) test_thread_context(); test_suspend_thread(); test_suspend_process(); + test_unload_trace(); #elif defined(__x86_64__) - pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, - "RtlAddFunctionTable" ); - pRtlDeleteFunctionTable = (void *)GetProcAddress( hntdll, - "RtlDeleteFunctionTable" ); - pRtlInstallFunctionTableCallback = (void *)GetProcAddress( hntdll, - "RtlInstallFunctionTableCallback" ); - pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, - "RtlLookupFunctionEntry" ); - pRtlAddGrowableFunctionTable = (void *)GetProcAddress( hntdll, "RtlAddGrowableFunctionTable" ); - pRtlGrowFunctionTable = (void *)GetProcAddress( hntdll, "RtlGrowFunctionTable" ); - pRtlDeleteGrowableFunctionTable = (void *)GetProcAddress( hntdll, "RtlDeleteGrowableFunctionTable" ); - p__C_specific_handler = (void *)GetProcAddress( hntdll, - "__C_specific_handler" ); - pRtlCaptureContext = (void *)GetProcAddress( hntdll, - "RtlCaptureContext" ); - pRtlRestoreContext = (void *)GetProcAddress( hntdll, - "RtlRestoreContext" ); - pRtlUnwindEx = (void *)GetProcAddress( hntdll, - "RtlUnwindEx" ); - pRtlWow64GetThreadContext = (void *)GetProcAddress( hntdll, - "RtlWow64GetThreadContext" ); - pRtlWow64SetThreadContext = (void *)GetProcAddress( hntdll, - "RtlWow64SetThreadContext" ); + +#define X(f) p##f = (void*)GetProcAddress(hntdll, #f) + X(RtlAddFunctionTable); + X(RtlDeleteFunctionTable); + X(RtlInstallFunctionTableCallback); + X(RtlLookupFunctionEntry); + X(RtlAddGrowableFunctionTable); + X(RtlGrowFunctionTable); + X(RtlDeleteGrowableFunctionTable); + X(__C_specific_handler); + X(RtlCaptureContext); + X(RtlRestoreContext); + X(RtlUnwindEx); + X(RtlWow64GetThreadContext); + X(RtlWow64SetThreadContext); +#undef X + p_setjmp = (void *)GetProcAddress( hmsvcrt, "_setjmp" ); @@ -3498,6 +3554,7 @@ START_TEST(exception) test_wow64_context(); test_suspend_thread(); test_suspend_process(); + test_unload_trace(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); -- 2.20.1

2 2

[PATCH resend 2] user32: make LoadString[AW] patchable
by Vladimir Bespalov 23 Apr '19

23 Apr '19

1 0

[PATCH resend] user32: make LoadString[AW] patchable
by Vladimir Bespalov 23 Apr '19

23 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46626 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Vlad Bespalov <vlad.botanic(a)gmail.com> --- dlls/user32/resource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 83442d85db..8dad3d53d5 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -234,7 +236,7 @@ BOOL WINAPI DestroyAcceleratorTable( HACCEL handle ) /********************************************************************** * LoadStringW (USER32.@) */ -INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, +INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, LPWSTR buffer, INT buflen ) { HGLOBAL hmem; @@ -289,7 +291,7 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, /********************************************************************** * LoadStringA (USER32.@) */ -INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) +INT WINAPI DECLSPEC_HOTPATCH LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) { HGLOBAL hmem; HRSRC hrsrc; -- 2.20.1

2 1

[PATCH 2/7] winemac.drv: Initialize GPU registry data.
by Zhiyi Zhang 23 Apr '19

23 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/display.c | 233 +++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 3 + 4 files changed, 238 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 3ffb7d666c..a5bd9a426f 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winemac.drv -IMPORTS = uuid user32 gdi32 advapi32 +IMPORTS = uuid user32 gdi32 advapi32 setupapi ntoskrnl DELAYIMPORTS = ole32 shell32 imm32 EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 00ad7738bb..b756510875 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -25,6 +25,13 @@ #include "winuser.h" #include "winreg.h" #include "ddrawi.h" +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/ntddk.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(display); @@ -47,6 +54,41 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW static const char initial_mode_key[] = "Initial Display Mode"; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; +static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR guid_fmtW[] = { + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; +static const WCHAR gpu_instance_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','%','0','8','X','&', + 'R','E','V','_','%','0','2','X','\\', + '%','0','8','X',0}; +static const WCHAR gpu_hardware_id_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR winemac_drvW[] = { + 'C',':','\\', + 'W','i','n','d','o','w','s','\\', + 'S','y','s','t','e','m','3','2','\\', + 'w','i','n','e','m','a','c','.','d','r','v',0}; +static const WCHAR nt_classW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; +static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; static CFArrayRef modes; @@ -1397,3 +1439,194 @@ void macdrv_displays_changed(const macdrv_event *event) MAKELPARAM(width, height)); } } + +/*********************************************************************** + * macdrv_init_gpu + * + * Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter. + * + * Return FALSE on failure and TRUE on success. + */ +static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int gpu_index, WCHAR *guid_string, + WCHAR *driver) +{ + static const BOOL present = TRUE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR instanceW[MAX_PATH]; + WCHAR nameW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + GUID guid; + INT written; + DWORD size; + BOOL ret = FALSE; + + sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + MultiByteToWideChar(CP_UTF8, 0, gpu->name, -1, nameW, ARRAY_SIZE(nameW)); + if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) + { + SetupDiCreateDeviceInfoW(devinfo, instanceW, &GUID_DEVCLASS_DISPLAY, nameW, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto fail; + } + + /* Write HaredwareID registry property */ + written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); + bufferW[written + 1] = 0; + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)bufferW, + (written + 2) * sizeof(WCHAR))) + goto fail; + + /* Write DEVPKEY_Device_IsPresent property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&present, sizeof(present), 0)) + goto fail; + + /* Open driver key. + * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write GraphicsDriver value */ + if (RegSetValueExW(hkey, graphics_driverW, 0, REG_SZ, (const BYTE *)winemac_drvW, sizeof(winemac_drvW))) + goto fail; + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)nameW, (strlenW(nameW) + 1) * sizeof(WCHAR))) + goto fail; + RegCloseKey(hkey); + hkey = NULL; + + /* Retrieve driver value for adapters */ + if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), + NULL)) + goto fail; + strcpyW(driver, nt_classW); + strcatW(driver, bufferW); + + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + size = sizeof(bufferW); + bufferW[0] = 0; + if (RegQueryValueExW(hkey, video_idW, 0, NULL, (BYTE *)bufferW, &size)) + { + ExUuidCreate(&guid); + sprintfW(bufferW, guid_fmtW, guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], + guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + } + strcpyW(guid_string, bufferW); + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize GPU\n"); + return ret; +} + +static void prepare_devices(void) +{ + static const BOOL not_present = FALSE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD i = 0; + + /* Set all GPUs as not present. We can't simply delete them because we need to keep the GUID consistent with + * each initialization run. We clean up non present GPUs at the end of initialization */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&not_present, sizeof(not_present), 0)) + ERR("Failed to set GPU present property\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void cleanup_devices(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + BOOL present; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + present = FALSE; + SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, &type, (BYTE *)&present, + sizeof(present), NULL, 0); + if (!present && !SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove GPU\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + +/*********************************************************************** + * macdrv_init_display_devices + * + * Initialize display device registry data. + * + * Return FALSE on failure and TRUE on success. + */ +BOOL macdrv_init_display_devices(void) +{ + struct macdrv_gpu *gpus = NULL; + INT gpu_count; + INT gpu; + HDEVINFO gpu_devinfo = NULL; + HKEY video_hkey = NULL; + DWORD disposition = 0; + WCHAR guidW[40]; + WCHAR driverW[1024]; + BOOL ret = FALSE; + + TRACE("\n"); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + goto fail; + + /* Ensure only one thread is initializing the registry and avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + { + ret = TRUE; + goto fail; + } + + /* FIXME: + * Currently we have no idea how to implement SetupDiGetClassDevsW with DIGCF_PRESENT properly. So we need to clean + * up not present devices in case applications use SetupDiGetClassDevsW to enumerate devices. Wrong devices could + * exist in registry as a result of prefix copying or having devices unplugged. But then we couldn't simply delete + * GPUs because we need to retain the same GUID for the same GPU. */ + prepare_devices(); + + gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + + /* Initialize GPUs */ + if (macdrv_get_gpus(&gpus, &gpu_count)) + goto fail; + + for (gpu = 0; gpu < gpu_count; gpu++) + { + if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + goto fail; + } + + ret = TRUE; +fail: + cleanup_devices(); + SetupDiDestroyDeviceInfoList(gpu_devinfo); + RegCloseKey(video_hkey); + if (gpus) + macdrv_free_gpus(gpus); + if (!ret) + ERR("Failed to initialize display devices\n"); + return ret; +} \ No newline at end of file diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index f948da42c7..dca89b04f0 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -223,6 +223,7 @@ extern CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HIDDEN; extern void check_retina_status(void) DECLSPEC_HIDDEN; +extern BOOL macdrv_init_display_devices(void) DECLSPEC_HIDDEN; /************************************************************************** * Mac IME driver diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 544d448f9f..0779952e9a 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -299,6 +299,9 @@ static BOOL process_attach(void) return FALSE; } + if (!macdrv_init_display_devices()) + return FALSE; + return TRUE; } -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH] winex11/wintab: Set all Device Orientation values.
by Alistair Leslie-Hughes 23 Apr '19

23 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winex11.drv/wintab.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 486c356..fe3d4a8 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -717,6 +717,11 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.ORIENTATION[1].axUnits = TU_CIRCLE; gSysDevice.ORIENTATION[1].axResolution = CASTFIX32(3600); + gSysDevice.ORIENTATION[2].axMin = 0; + gSysDevice.ORIENTATION[2].axMax = 3600; + gSysDevice.ORIENTATION[2].axUnits = TU_CIRCLE; + gSysDevice.ORIENTATION[2].axResolution + = CASTFIX32(3600); Axis++; } } -- 1.9.1

1 0

[PATCH 2/2] devenum: iterate over all avicap devices instead of giving up at the first failure
by Damjan Jovanovic 23 Apr '19

23 Apr '19

Some /dev/video* device nodes aren't capture devices, so capGetDriverDescriptionW() will fail for them, but there could still be valid ones later on. Iterate over all 10 instead of giving up at the first failure. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/2] avicap32: verify v4l devices can capture before returning them
by Damjan Jovanovic 23 Apr '19

23 Apr '19

/dev/video* device nodes aren't all capture devices, and returning those that aren't results in devenum reporting them to applications, which will later fail when opening them with IMoniker::BindToObject(). avicap32 already tries to call VIDIOC_QUERYCAP to check whether it's dealing with a v4l device, but it does not check a successful result any further. Get it to verify the device supports the V4L2_CAP_VIDEO_CAPTURE flag, like we do in qcap/v4l.c. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/avicap32/avicap32_main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)

1 0

[PATCH 1/3] kernel/nls: add LOCALE_SMONTHDAY to all supported languages
by Vijay Kiran Kamuju 23 Apr '19

23 Apr '19

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/nls/afk.nls | 1 + dlls/kernel32/nls/ara.nls | 1 + dlls/kernel32/nls/arb.nls | 1 + dlls/kernel32/nls/are.nls | 1 + dlls/kernel32/nls/arg.nls | 1 + dlls/kernel32/nls/arh.nls | 1 + dlls/kernel32/nls/ari.nls | 1 + dlls/kernel32/nls/arj.nls | 1 + dlls/kernel32/nls/ark.nls | 1 + dlls/kernel32/nls/arl.nls | 1 + dlls/kernel32/nls/arm.nls | 1 + dlls/kernel32/nls/aro.nls | 1 + dlls/kernel32/nls/arq.nls | 1 + dlls/kernel32/nls/ars.nls | 1 + dlls/kernel32/nls/art.nls | 1 + dlls/kernel32/nls/aru.nls | 1 + dlls/kernel32/nls/ary.nls | 1 + dlls/kernel32/nls/aze.nls | 1 + dlls/kernel32/nls/azl.nls | 1 + dlls/kernel32/nls/bel.nls | 1 + dlls/kernel32/nls/ben.nls | 1 + dlls/kernel32/nls/bgr.nls | 1 + dlls/kernel32/nls/brf.nls | 1 + dlls/kernel32/nls/cat.nls | 1 + dlls/kernel32/nls/chs.nls | 1 + dlls/kernel32/nls/cht.nls | 1 + dlls/kernel32/nls/cor.nls | 1 + dlls/kernel32/nls/csy.nls | 1 + dlls/kernel32/nls/cym.nls | 1 + dlls/kernel32/nls/dan.nls | 1 + dlls/kernel32/nls/dea.nls | 1 + dlls/kernel32/nls/dec.nls | 1 + dlls/kernel32/nls/del.nls | 1 + dlls/kernel32/nls/des.nls | 1 + dlls/kernel32/nls/deu.nls | 1 + dlls/kernel32/nls/div.nls | 1 + dlls/kernel32/nls/ell.nls | 1 + dlls/kernel32/nls/ena.nls | 1 + dlls/kernel32/nls/enb.nls | 1 + dlls/kernel32/nls/enc.nls | 1 + dlls/kernel32/nls/eng.nls | 1 + dlls/kernel32/nls/eni.nls | 1 + dlls/kernel32/nls/enj.nls | 1 + dlls/kernel32/nls/enl.nls | 1 + dlls/kernel32/nls/enp.nls | 1 + dlls/kernel32/nls/ens.nls | 1 + dlls/kernel32/nls/ent.nls | 1 + dlls/kernel32/nls/enu.nls | 1 + dlls/kernel32/nls/enw.nls | 1 + dlls/kernel32/nls/enz.nls | 1 + dlls/kernel32/nls/eox.nls | 1 + dlls/kernel32/nls/esa.nls | 1 + dlls/kernel32/nls/esb.nls | 1 + dlls/kernel32/nls/esc.nls | 1 + dlls/kernel32/nls/esd.nls | 1 + dlls/kernel32/nls/ese.nls | 1 + dlls/kernel32/nls/esf.nls | 1 + dlls/kernel32/nls/esg.nls | 1 + dlls/kernel32/nls/esh.nls | 1 + dlls/kernel32/nls/esi.nls | 1 + dlls/kernel32/nls/esl.nls | 1 + dlls/kernel32/nls/esm.nls | 1 + dlls/kernel32/nls/esn.nls | 1 + dlls/kernel32/nls/eso.nls | 1 + dlls/kernel32/nls/esp.nls | 1 + dlls/kernel32/nls/esr.nls | 1 + dlls/kernel32/nls/ess.nls | 1 + dlls/kernel32/nls/esu.nls | 1 + dlls/kernel32/nls/esv.nls | 1 + dlls/kernel32/nls/esy.nls | 1 + dlls/kernel32/nls/esz.nls | 1 + dlls/kernel32/nls/eti.nls | 1 + dlls/kernel32/nls/euq.nls | 1 + dlls/kernel32/nls/far.nls | 1 + dlls/kernel32/nls/fin.nls | 1 + dlls/kernel32/nls/fos.nls | 1 + dlls/kernel32/nls/fra.nls | 1 + dlls/kernel32/nls/frb.nls | 1 + dlls/kernel32/nls/frc.nls | 1 + dlls/kernel32/nls/frl.nls | 1 + dlls/kernel32/nls/frm.nls | 1 + dlls/kernel32/nls/frs.nls | 1 + dlls/kernel32/nls/gae.nls | 1 + dlls/kernel32/nls/gdh.nls | 1 + dlls/kernel32/nls/gdv.nls | 2 +- dlls/kernel32/nls/glc.nls | 1 + dlls/kernel32/nls/guj.nls | 1 + dlls/kernel32/nls/heb.nls | 1 + dlls/kernel32/nls/hin.nls | 1 + dlls/kernel32/nls/hrv.nls | 1 + dlls/kernel32/nls/hun.nls | 1 + dlls/kernel32/nls/hye.nls | 1 + dlls/kernel32/nls/ind.nls | 1 + dlls/kernel32/nls/isl.nls | 1 + dlls/kernel32/nls/ita.nls | 1 + dlls/kernel32/nls/its.nls | 1 + dlls/kernel32/nls/ivl.nls | 1 + dlls/kernel32/nls/jpn.nls | 1 + dlls/kernel32/nls/kan.nls | 1 + dlls/kernel32/nls/kat.nls | 1 + dlls/kernel32/nls/kkz.nls | 1 + dlls/kernel32/nls/knk.nls | 1 + dlls/kernel32/nls/kor.nls | 1 + dlls/kernel32/nls/kyr.nls | 1 + dlls/kernel32/nls/lth.nls | 1 + dlls/kernel32/nls/lvi.nls | 1 + dlls/kernel32/nls/mar.nls | 1 + dlls/kernel32/nls/mki.nls | 1 + dlls/kernel32/nls/mon.nls | 1 + dlls/kernel32/nls/msb.nls | 1 + dlls/kernel32/nls/msl.nls | 1 + dlls/kernel32/nls/nep.nls | 1 + dlls/kernel32/nls/nlb.nls | 1 + dlls/kernel32/nls/nld.nls | 1 + dlls/kernel32/nls/nls.nls | 1 + dlls/kernel32/nls/non.nls | 1 + dlls/kernel32/nls/nor.nls | 1 + dlls/kernel32/nls/pan.nls | 1 + dlls/kernel32/nls/plk.nls | 1 + dlls/kernel32/nls/ptb.nls | 1 + dlls/kernel32/nls/ptg.nls | 1 + dlls/kernel32/nls/rmc.nls | 1 + dlls/kernel32/nls/rom.nls | 1 + dlls/kernel32/nls/rus.nls | 1 + dlls/kernel32/nls/san.nls | 1 + dlls/kernel32/nls/sin.nls | 1 + dlls/kernel32/nls/sky.nls | 1 + dlls/kernel32/nls/slv.nls | 1 + dlls/kernel32/nls/sqi.nls | 1 + dlls/kernel32/nls/srb.nls | 1 + dlls/kernel32/nls/srl.nls | 1 + dlls/kernel32/nls/sve.nls | 1 + dlls/kernel32/nls/svf.nls | 1 + dlls/kernel32/nls/swk.nls | 1 + dlls/kernel32/nls/syr.nls | 1 + dlls/kernel32/nls/tam.nls | 1 + dlls/kernel32/nls/tel.nls | 1 + dlls/kernel32/nls/tha.nls | 1 + dlls/kernel32/nls/trk.nls | 1 + dlls/kernel32/nls/ttt.nls | 1 + dlls/kernel32/nls/ukr.nls | 1 + dlls/kernel32/nls/urd.nls | 1 + dlls/kernel32/nls/uzb.nls | 1 + dlls/kernel32/nls/uzl.nls | 1 + dlls/kernel32/nls/vit.nls | 1 + dlls/kernel32/nls/wal.nls | 1 + dlls/kernel32/nls/zhh.nls | 1 + dlls/kernel32/nls/zhi.nls | 1 + dlls/kernel32/nls/zhm.nls | 1 + 149 files changed, 149 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/afk.nls b/dlls/kernel32/nls/afk.nls index 350b3c31fdc..6225c47107e 100644 --- a/dlls/kernel32/nls/afk.nls +++ b/dlls/kernel32/nls/afk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_AFRIKAANS, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januarie" LOCALE_SMONTHNAME2 "Februarie" LOCALE_SMONTHNAME3 "Maart" diff --git a/dlls/kernel32/nls/ara.nls b/dlls/kernel32/nls/ara.nls index a7a3937156f..c3eb6f9a108 100644 --- a/dlls/kernel32/nls/ara.nls +++ b/dlls/kernel32/nls/ara.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arb.nls b/dlls/kernel32/nls/arb.nls index 8bc2ba1f33d..dd3c328277d 100644 --- a/dlls/kernel32/nls/arb.nls +++ b/dlls/kernel32/nls/arb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LEBANON LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "كانون الثاني" LOCALE_SMONTHNAME2 "شباط" LOCALE_SMONTHNAME3 "آذار" diff --git a/dlls/kernel32/nls/are.nls b/dlls/kernel32/nls/are.nls index 6b94dd68a0e..4f39b76191a 100644 --- a/dlls/kernel32/nls/are.nls +++ b/dlls/kernel32/nls/are.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arg.nls b/dlls/kernel32/nls/arg.nls index 38ea3631a84..096945efd12 100644 --- a/dlls/kernel32/nls/arg.nls +++ b/dlls/kernel32/nls/arg.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_ALGERIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "جانفييه" LOCALE_SMONTHNAME2 "فيفرييه" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arh.nls b/dlls/kernel32/nls/arh.nls index c945fceac00..ad33914fa33 100644 --- a/dlls/kernel32/nls/arh.nls +++ b/dlls/kernel32/nls/arh.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/ari.nls b/dlls/kernel32/nls/ari.nls index e827848bc9c..d405c1b90b9 100644 --- a/dlls/kernel32/nls/ari.nls +++ b/dlls/kernel32/nls/ari.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_IRAQ LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "كانون الثاني" LOCALE_SMONTHNAME2 "شباط" LOCALE_SMONTHNAME3 "آذار" diff --git a/dlls/kernel32/nls/arj.nls b/dlls/kernel32/nls/arj.nls index 58759376354..e24a636b156 100644 --- a/dlls/kernel32/nls/arj.nls +++ b/dlls/kernel32/nls/arj.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "كانون الثاني" LOCALE_SMONTHNAME2 "شباط" LOCALE_SMONTHNAME3 "آذار" diff --git a/dlls/kernel32/nls/ark.nls b/dlls/kernel32/nls/ark.nls index f9a64487a0d..7fbb44d9265 100644 --- a/dlls/kernel32/nls/ark.nls +++ b/dlls/kernel32/nls/ark.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_KUWAIT LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arl.nls b/dlls/kernel32/nls/arl.nls index 540b39e076d..bfd98e61390 100644 --- a/dlls/kernel32/nls/arl.nls +++ b/dlls/kernel32/nls/arl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_LIBYA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arm.nls b/dlls/kernel32/nls/arm.nls index 416e9cb3db6..01782330fe9 100644 --- a/dlls/kernel32/nls/arm.nls +++ b/dlls/kernel32/nls/arm.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_MOROCCO LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "جانفييه" LOCALE_SMONTHNAME2 "فيفرييه" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/aro.nls b/dlls/kernel32/nls/aro.nls index faaf5a38372..0a17050796a 100644 --- a/dlls/kernel32/nls/aro.nls +++ b/dlls/kernel32/nls/aro.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_OMAN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/arq.nls b/dlls/kernel32/nls/arq.nls index 4c983af2206..d27b91a191b 100644 --- a/dlls/kernel32/nls/arq.nls +++ b/dlls/kernel32/nls/arq.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_QATAR LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/ars.nls b/dlls/kernel32/nls/ars.nls index 9e731826d33..37553db7fdc 100644 --- a/dlls/kernel32/nls/ars.nls +++ b/dlls/kernel32/nls/ars.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SYRIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "كانون الثاني" LOCALE_SMONTHNAME2 "شباط" LOCALE_SMONTHNAME3 "آذار" diff --git a/dlls/kernel32/nls/art.nls b/dlls/kernel32/nls/art.nls index a647bbdc94b..5abe9e9c812 100644 --- a/dlls/kernel32/nls/art.nls +++ b/dlls/kernel32/nls/art.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "جانفي" LOCALE_SMONTHNAME2 "فيفري" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/aru.nls b/dlls/kernel32/nls/aru.nls index 64d4b71f0b8..8b3b68883b5 100644 --- a/dlls/kernel32/nls/aru.nls +++ b/dlls/kernel32/nls/aru.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_UAE LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/ary.nls b/dlls/kernel32/nls/ary.nls index ed7549eeb8f..34a3234b263 100644 --- a/dlls/kernel32/nls/ary.nls +++ b/dlls/kernel32/nls/ary.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_YEMEN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "يناير" LOCALE_SMONTHNAME2 "فبراير" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls index bc2db0d0c75..d2a3c15b3df 100644 --- a/dlls/kernel32/nls/aze.nls +++ b/dlls/kernel32/nls/aze.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Јанвар" LOCALE_SMONTHNAME2 "Феврал" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/azl.nls b/dlls/kernel32/nls/azl.nls index 6c5233a2385..b14672c9990 100644 --- a/dlls/kernel32/nls/azl.nls +++ b/dlls/kernel32/nls/azl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Yanvar" LOCALE_SMONTHNAME2 "Fevral" LOCALE_SMONTHNAME3 "Mart" diff --git a/dlls/kernel32/nls/bel.nls b/dlls/kernel32/nls/bel.nls index 3d046ba729c..d98514c1726 100644 --- a/dlls/kernel32/nls/bel.nls +++ b/dlls/kernel32/nls/bel.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;3" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Студзень\0студзеня" LOCALE_SMONTHNAME2 "Люты\0лютага" LOCALE_SMONTHNAME3 "Сакавік\0сакавіка" diff --git a/dlls/kernel32/nls/ben.nls b/dlls/kernel32/nls/ben.nls index d848937c2fd..c87a122eed8 100644 --- a/dlls/kernel32/nls/ben.nls +++ b/dlls/kernel32/nls/ben.nls @@ -103,6 +103,7 @@ STRINGTABLE LANGUAGE LANG_BANGLA, SUBLANG_BANGLA_INDIA LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "জানুয়ারী" LOCALE_SMONTHNAME2 "ফেব্রুয়ারী" LOCALE_SMONTHNAME3 "মার্চ" diff --git a/dlls/kernel32/nls/bgr.nls b/dlls/kernel32/nls/bgr.nls index 7c8732886f2..1e096a188fd 100644 --- a/dlls/kernel32/nls/bgr.nls +++ b/dlls/kernel32/nls/bgr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy 'г.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Януари" LOCALE_SMONTHNAME2 "Февруари" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/brf.nls b/dlls/kernel32/nls/brf.nls index 1e19c504041..1b80651f96b 100644 --- a/dlls/kernel32/nls/brf.nls +++ b/dlls/kernel32/nls/brf.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Genver" LOCALE_SMONTHNAME2 "C'hwevrer" LOCALE_SMONTHNAME3 "Meurzh" diff --git a/dlls/kernel32/nls/cat.nls b/dlls/kernel32/nls/cat.nls index c2b386f9b1d..e8192b49c94 100644 --- a/dlls/kernel32/nls/cat.nls +++ b/dlls/kernel32/nls/cat.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "gener" LOCALE_SMONTHNAME2 "febrer" LOCALE_SMONTHNAME3 "març" diff --git a/dlls/kernel32/nls/chs.nls b/dlls/kernel32/nls/chs.nls index 6dc66a3aa37..187700d8489 100644 --- a/dlls/kernel32/nls/chs.nls +++ b/dlls/kernel32/nls/chs.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "一月" LOCALE_SMONTHNAME2 "二月" LOCALE_SMONTHNAME3 "三月" diff --git a/dlls/kernel32/nls/cht.nls b/dlls/kernel32/nls/cht.nls index c08b807a9da..f10fc637d42 100644 --- a/dlls/kernel32/nls/cht.nls +++ b/dlls/kernel32/nls/cht.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "一月" LOCALE_SMONTHNAME2 "二月" LOCALE_SMONTHNAME3 "三月" diff --git a/dlls/kernel32/nls/cor.nls b/dlls/kernel32/nls/cor.nls index ab6cbde28bf..bb8ed9087c8 100644 --- a/dlls/kernel32/nls/cor.nls +++ b/dlls/kernel32/nls/cor.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_CORNISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "Mys Genver" LOCALE_SMONTHNAME2 "Mys Whevrel" LOCALE_SMONTHNAME3 "Mys Merth" diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls index 7d7aa0e94f3..982fe068e11 100644 --- a/dlls/kernel32/nls/csy.nls +++ b/dlls/kernel32/nls/csy.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "leden\0ledna" LOCALE_SMONTHNAME2 "únor\0února" LOCALE_SMONTHNAME3 "březen\0března" diff --git a/dlls/kernel32/nls/cym.nls b/dlls/kernel32/nls/cym.nls index f609eb35f01..a1eb319a29b 100644 --- a/dlls/kernel32/nls/cym.nls +++ b/dlls/kernel32/nls/cym.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Ionawr" LOCALE_SMONTHNAME2 "Chwefror" LOCALE_SMONTHNAME3 "Mawrth" diff --git a/dlls/kernel32/nls/dan.nls b/dlls/kernel32/nls/dan.nls index ecd516e686e..db2799bfa53 100644 --- a/dlls/kernel32/nls/dan.nls +++ b/dlls/kernel32/nls/dan.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "marts" diff --git a/dlls/kernel32/nls/dea.nls b/dlls/kernel32/nls/dea.nls index 7b5147045f7..b35cac95d13 100644 --- a/dlls/kernel32/nls/dea.nls +++ b/dlls/kernel32/nls/dea.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN LOCALE_SLONGDATE "dddd, dd. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Jänner" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/dec.nls b/dlls/kernel32/nls/dec.nls index 0a7a80c7ebf..0668d7924cb 100644 --- a/dlls/kernel32/nls/dec.nls +++ b/dlls/kernel32/nls/dec.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januar" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/del.nls b/dlls/kernel32/nls/del.nls index a57f71604ee..349320d6bfa 100644 --- a/dlls/kernel32/nls/del.nls +++ b/dlls/kernel32/nls/del.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januar" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/des.nls b/dlls/kernel32/nls/des.nls index 26b12878f74..48f463d57dd 100644 --- a/dlls/kernel32/nls/des.nls +++ b/dlls/kernel32/nls/des.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januar" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/deu.nls b/dlls/kernel32/nls/deu.nls index 83d88eb7461..9742fabe5eb 100644 --- a/dlls/kernel32/nls/deu.nls +++ b/dlls/kernel32/nls/deu.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januar" LOCALE_SMONTHNAME2 "Februar" LOCALE_SMONTHNAME3 "März" diff --git a/dlls/kernel32/nls/div.nls b/dlls/kernel32/nls/div.nls index 9fa2fd0e7ee..8169aa3c4e0 100644 --- a/dlls/kernel32/nls/div.nls +++ b/dlls/kernel32/nls/div.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_DIVEHI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "ޖެނުއަރީ" LOCALE_SMONTHNAME2 "ފެބުރުއަރީ" LOCALE_SMONTHNAME3 "މާޗް" diff --git a/dlls/kernel32/nls/ell.nls b/dlls/kernel32/nls/ell.nls index 63e8a2d1572..f2f1a05d371 100644 --- a/dlls/kernel32/nls/ell.nls +++ b/dlls/kernel32/nls/ell.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GREEK, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Ιανουάριος" LOCALE_SMONTHNAME2 "Φεβρουάριος" LOCALE_SMONTHNAME3 "Μάρτιος" diff --git a/dlls/kernel32/nls/ena.nls b/dlls/kernel32/nls/ena.nls index 26d51dae34b..54f9e0361e7 100644 --- a/dlls/kernel32/nls/ena.nls +++ b/dlls/kernel32/nls/ena.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS LOCALE_SLONGDATE "dddd, d MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls index 7aa6facc699..c6526005a9e 100644 --- a/dlls/kernel32/nls/enb.nls +++ b/dlls/kernel32/nls/enb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enc.nls b/dlls/kernel32/nls/enc.nls index 42cbe9e0c62..c71fd4afc96 100644 --- a/dlls/kernel32/nls/enc.nls +++ b/dlls/kernel32/nls/enc.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN LOCALE_SLONGDATE "MMMM d, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/eng.nls b/dlls/kernel32/nls/eng.nls index 5f66fe42620..bbf76560ca9 100644 --- a/dlls/kernel32/nls/eng.nls +++ b/dlls/kernel32/nls/eng.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/eni.nls b/dlls/kernel32/nls/eni.nls index 298a97d761d..2316a3ed4b2 100644 --- a/dlls/kernel32/nls/eni.nls +++ b/dlls/kernel32/nls/eni.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enj.nls b/dlls/kernel32/nls/enj.nls index cf575e54ab5..bab9960108c 100644 --- a/dlls/kernel32/nls/enj.nls +++ b/dlls/kernel32/nls/enj.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enl.nls b/dlls/kernel32/nls/enl.nls index fd7b2bcd9ec..2c9e794d891 100644 --- a/dlls/kernel32/nls/enl.nls +++ b/dlls/kernel32/nls/enl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE LOCALE_SLONGDATE "dddd, dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enp.nls b/dlls/kernel32/nls/enp.nls index 4c37be19fd6..ab76dd706d1 100644 --- a/dlls/kernel32/nls/enp.nls +++ b/dlls/kernel32/nls/enp.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/ens.nls b/dlls/kernel32/nls/ens.nls index 6c8aa16f867..3d2033e5f90 100644 --- a/dlls/kernel32/nls/ens.nls +++ b/dlls/kernel32/nls/ens.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/ent.nls b/dlls/kernel32/nls/ent.nls index 4285577596d..79153c6dc4b 100644 --- a/dlls/kernel32/nls/ent.nls +++ b/dlls/kernel32/nls/ent.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD LOCALE_SLONGDATE "dddd, dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enu.nls b/dlls/kernel32/nls/enu.nls index 119b9cc18c5..0eea48723e6 100644 --- a/dlls/kernel32/nls/enu.nls +++ b/dlls/kernel32/nls/enu.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enw.nls b/dlls/kernel32/nls/enw.nls index 26d04cb6140..0e2e0bffb0c 100644 --- a/dlls/kernel32/nls/enw.nls +++ b/dlls/kernel32/nls/enw.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_ZIMBABWE LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/enz.nls b/dlls/kernel32/nls/enz.nls index 66baca17834..06295d5d499 100644 --- a/dlls/kernel32/nls/enz.nls +++ b/dlls/kernel32/nls/enz.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_NZ LOCALE_SLONGDATE "dddd, d MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index 0dc82fe3a77..5a4bc2370ef 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -125,6 +125,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SLONGDATE "ddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "januaro" LOCALE_SMONTHNAME2 "februaro" LOCALE_SMONTHNAME3 "marto" diff --git a/dlls/kernel32/nls/esa.nls b/dlls/kernel32/nls/esa.nls index 3b850095c36..0b03d3939ea 100644 --- a/dlls/kernel32/nls/esa.nls +++ b/dlls/kernel32/nls/esa.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esb.nls b/dlls/kernel32/nls/esb.nls index ade33beec12..b6669b862c0 100644 --- a/dlls/kernel32/nls/esb.nls +++ b/dlls/kernel32/nls/esb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esc.nls b/dlls/kernel32/nls/esc.nls index d34eb31a0c7..f4171baa1c0 100644 --- a/dlls/kernel32/nls/esc.nls +++ b/dlls/kernel32/nls/esc.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esd.nls b/dlls/kernel32/nls/esd.nls index cd549adf4e6..988f26ad402 100644 --- a/dlls/kernel32/nls/esd.nls +++ b/dlls/kernel32/nls/esd.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/ese.nls b/dlls/kernel32/nls/ese.nls index b39fde0f5bd..e1fe67a8c70 100644 --- a/dlls/kernel32/nls/ese.nls +++ b/dlls/kernel32/nls/ese.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esf.nls b/dlls/kernel32/nls/esf.nls index d3a5a7129d4..2e87edfcdda 100644 --- a/dlls/kernel32/nls/esf.nls +++ b/dlls/kernel32/nls/esf.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esg.nls b/dlls/kernel32/nls/esg.nls index ed6fa4b0a7e..1519a12ce30 100644 --- a/dlls/kernel32/nls/esg.nls +++ b/dlls/kernel32/nls/esg.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esh.nls b/dlls/kernel32/nls/esh.nls index 701f55a1c01..c8342a40b7b 100644 --- a/dlls/kernel32/nls/esh.nls +++ b/dlls/kernel32/nls/esh.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esi.nls b/dlls/kernel32/nls/esi.nls index 8f0948e1f3e..23843939f1c 100644 --- a/dlls/kernel32/nls/esi.nls +++ b/dlls/kernel32/nls/esi.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esl.nls b/dlls/kernel32/nls/esl.nls index 04648a7ea5e..6d48cf5fedd 100644 --- a/dlls/kernel32/nls/esl.nls +++ b/dlls/kernel32/nls/esl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esm.nls b/dlls/kernel32/nls/esm.nls index 514ea13f56a..9a515673da3 100644 --- a/dlls/kernel32/nls/esm.nls +++ b/dlls/kernel32/nls/esm.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esn.nls b/dlls/kernel32/nls/esn.nls index 627eda2e9e7..a291db867ee 100644 --- a/dlls/kernel32/nls/esn.nls +++ b/dlls/kernel32/nls/esn.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "enero" LOCALE_SMONTHNAME2 "febrero" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/eso.nls b/dlls/kernel32/nls/eso.nls index 3c4252a6e5b..15da10aeb38 100644 --- a/dlls/kernel32/nls/eso.nls +++ b/dlls/kernel32/nls/eso.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esp.nls b/dlls/kernel32/nls/esp.nls index 3774e283d0c..abd326acbd6 100644 --- a/dlls/kernel32/nls/esp.nls +++ b/dlls/kernel32/nls/esp.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "enero" LOCALE_SMONTHNAME2 "febrero" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/esr.nls b/dlls/kernel32/nls/esr.nls index 937e3cba394..fd3b788f5a2 100644 --- a/dlls/kernel32/nls/esr.nls +++ b/dlls/kernel32/nls/esr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/ess.nls b/dlls/kernel32/nls/ess.nls index 7819d4589d0..ae1863973cb 100644 --- a/dlls/kernel32/nls/ess.nls +++ b/dlls/kernel32/nls/ess.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esu.nls b/dlls/kernel32/nls/esu.nls index fb1e411dcd4..46cd5c77ba5 100644 --- a/dlls/kernel32/nls/esu.nls +++ b/dlls/kernel32/nls/esu.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esv.nls b/dlls/kernel32/nls/esv.nls index 31b1b8f918c..f6661abb894 100644 --- a/dlls/kernel32/nls/esv.nls +++ b/dlls/kernel32/nls/esv.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esy.nls b/dlls/kernel32/nls/esy.nls index f977cab0cd5..8b170de0223 100644 --- a/dlls/kernel32/nls/esy.nls +++ b/dlls/kernel32/nls/esy.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/esz.nls b/dlls/kernel32/nls/esz.nls index 7e5d4aeaf1e..09ca6c7d9ff 100644 --- a/dlls/kernel32/nls/esz.nls +++ b/dlls/kernel32/nls/esz.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Enero" LOCALE_SMONTHNAME2 "Febrero" LOCALE_SMONTHNAME3 "Marzo" diff --git a/dlls/kernel32/nls/eti.nls b/dlls/kernel32/nls/eti.nls index 2a04fabb105..d8a984477af 100644 --- a/dlls/kernel32/nls/eti.nls +++ b/dlls/kernel32/nls/eti.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy'. a.'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "jaanuar" LOCALE_SMONTHNAME2 "veebruar" LOCALE_SMONTHNAME3 "märts" diff --git a/dlls/kernel32/nls/euq.nls b/dlls/kernel32/nls/euq.nls index ede760e1dc9..036aa18ecd2 100644 --- a/dlls/kernel32/nls/euq.nls +++ b/dlls/kernel32/nls/euq.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, yyyy.'eko' MMMM'k 'd" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "urtarrila" LOCALE_SMONTHNAME2 "otsaila" LOCALE_SMONTHNAME3 "martxoa" diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 4b598b4ad86..7cc3fae408b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy/MM/dd" LOCALE_SMONDECIMALSEP "٫" LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ژانویه" LOCALE_SMONTHNAME2 "فوریه" LOCALE_SMONTHNAME3 "مارس" diff --git a/dlls/kernel32/nls/fin.nls b/dlls/kernel32/nls/fin.nls index ab6d4e11405..9ceea69bf55 100644 --- a/dlls/kernel32/nls/fin.nls +++ b/dlls/kernel32/nls/fin.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM'ta 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM'ta'" LOCALE_SMONTHNAME1 "tammikuu" LOCALE_SMONTHNAME2 "helmikuu" LOCALE_SMONTHNAME3 "maaliskuu" diff --git a/dlls/kernel32/nls/fos.nls b/dlls/kernel32/nls/fos.nls index eaca95cb281..262d8564fe8 100644 --- a/dlls/kernel32/nls/fos.nls +++ b/dlls/kernel32/nls/fos.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FAEROESE, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls index d0046a34f63..bbbabf37a47 100644 --- a/dlls/kernel32/nls/fra.nls +++ b/dlls/kernel32/nls/fra.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls index a4732e33b73..8a6c844cb49 100644 --- a/dlls/kernel32/nls/frb.nls +++ b/dlls/kernel32/nls/frb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls index 9a617b1af71..3d64bb77281 100644 --- a/dlls/kernel32/nls/frc.nls +++ b/dlls/kernel32/nls/frc.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN LOCALE_SLONGDATE "d MMMM, yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls index d3b5e8ff2ab..0d4d7fc0cd3 100644 --- a/dlls/kernel32/nls/frl.nls +++ b/dlls/kernel32/nls/frl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls index cf917ebc484..bcfbb56d3c5 100644 --- a/dlls/kernel32/nls/frm.nls +++ b/dlls/kernel32/nls/frm.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls index 4249939da9b..592e0e692ee 100644 --- a/dlls/kernel32/nls/frs.nls +++ b/dlls/kernel32/nls/frs.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "janvier" LOCALE_SMONTHNAME2 "février" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/gae.nls b/dlls/kernel32/nls/gae.nls index 1d551048c25..5490dddd8df 100644 --- a/dlls/kernel32/nls/gae.nls +++ b/dlls/kernel32/nls/gae.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Eanáir" LOCALE_SMONTHNAME2 "Feabhra" LOCALE_SMONTHNAME3 "Márta" diff --git a/dlls/kernel32/nls/gdh.nls b/dlls/kernel32/nls/gdh.nls index 5718482efe4..7f60c5130ae 100644 --- a/dlls/kernel32/nls/gdh.nls +++ b/dlls/kernel32/nls/gdh.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Am Faoilteach" LOCALE_SMONTHNAME2 "An Gearann" LOCALE_SMONTHNAME3 "Am Màrt" diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls index 51e9ad0b868..5e4f7b56385 100644 --- a/dlls/kernel32/nls/gdv.nls +++ b/dlls/kernel32/nls/gdv.nls @@ -104,13 +104,13 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "GBP" LOCALE_SISO3166CTRYNAME "IM" - LOCALE_SISO639LANGNAME "gv" LOCALE_SLANGUAGE "Gaelg (Manninn)" LOCALE_SLIST "," LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "Jerrey-geuree" LOCALE_SMONTHNAME2 "Toshiaght-arree" LOCALE_SMONTHNAME3 "Mayrnt" diff --git a/dlls/kernel32/nls/glc.nls b/dlls/kernel32/nls/glc.nls index 8d960cb16fd..ec9e949808a 100644 --- a/dlls/kernel32/nls/glc.nls +++ b/dlls/kernel32/nls/glc.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, dd' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "xaneiro" LOCALE_SMONTHNAME2 "febreiro" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/guj.nls b/dlls/kernel32/nls/guj.nls index 1f2b5f77d8e..956743147ad 100644 --- a/dlls/kernel32/nls/guj.nls +++ b/dlls/kernel32/nls/guj.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GUJARATI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "જાન્યુઆરી" LOCALE_SMONTHNAME2 "ફેબ્રુઆરી" LOCALE_SMONTHNAME3 "માર્ચ" diff --git a/dlls/kernel32/nls/heb.nls b/dlls/kernel32/nls/heb.nls index 8f115215025..99f3acc3fc7 100644 --- a/dlls/kernel32/nls/heb.nls +++ b/dlls/kernel32/nls/heb.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd ה־dd בMMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ינואר" LOCALE_SMONTHNAME2 "פברואר" LOCALE_SMONTHNAME3 "מרץ" diff --git a/dlls/kernel32/nls/hin.nls b/dlls/kernel32/nls/hin.nls index a37fb1ab2d9..b300d25063e 100644 --- a/dlls/kernel32/nls/hin.nls +++ b/dlls/kernel32/nls/hin.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_HINDI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "जनवरी" LOCALE_SMONTHNAME2 "फरवरी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/hrv.nls b/dlls/kernel32/nls/hrv.nls index a67d0c4ddef..b321e9176f7 100644 --- a/dlls/kernel32/nls/hrv.nls +++ b/dlls/kernel32/nls/hrv.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "siječanj\0siječnja" LOCALE_SMONTHNAME2 "veljača\0veljače" LOCALE_SMONTHNAME3 "ožujak\0ožujka" diff --git a/dlls/kernel32/nls/hun.nls b/dlls/kernel32/nls/hun.nls index 8a5e41d5c79..c28b8efdb00 100644 --- a/dlls/kernel32/nls/hun.nls +++ b/dlls/kernel32/nls/hun.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy. MMMM d." LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM d." LOCALE_SMONTHNAME1 "január" LOCALE_SMONTHNAME2 "február" LOCALE_SMONTHNAME3 "március" diff --git a/dlls/kernel32/nls/hye.nls b/dlls/kernel32/nls/hye.nls index 6dfe6b5802b..c157c2ae436 100644 --- a/dlls/kernel32/nls/hye.nls +++ b/dlls/kernel32/nls/hye.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Հունվար\0հունվարի" LOCALE_SMONTHNAME2 "Փետրվար\0փետրվարի" LOCALE_SMONTHNAME3 "Մարտ\0մարտի" diff --git a/dlls/kernel32/nls/ind.nls b/dlls/kernel32/nls/ind.nls index be1e701e476..7ca67c3a9aa 100644 --- a/dlls/kernel32/nls/ind.nls +++ b/dlls/kernel32/nls/ind.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januari" LOCALE_SMONTHNAME2 "Februari" LOCALE_SMONTHNAME3 "Maret" diff --git a/dlls/kernel32/nls/isl.nls b/dlls/kernel32/nls/isl.nls index 254ddefe034..a3a5547b8fa 100644 --- a/dlls/kernel32/nls/isl.nls +++ b/dlls/kernel32/nls/isl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ICELANDIC, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "janúar" LOCALE_SMONTHNAME2 "febrúar" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/ita.nls b/dlls/kernel32/nls/ita.nls index 43b9418f2e3..fda73ecc4f8 100644 --- a/dlls/kernel32/nls/ita.nls +++ b/dlls/kernel32/nls/ita.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "gennaio" LOCALE_SMONTHNAME2 "febbraio" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/its.nls b/dlls/kernel32/nls/its.nls index 9307175b4b2..840cdc52d58 100644 --- a/dlls/kernel32/nls/its.nls +++ b/dlls/kernel32/nls/its.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN_SWISS LOCALE_SLONGDATE "dddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "gennaio" LOCALE_SMONTHNAME2 "febbraio" LOCALE_SMONTHNAME3 "marzo" diff --git a/dlls/kernel32/nls/ivl.nls b/dlls/kernel32/nls/ivl.nls index c1f689f7e7c..65ada52bc81 100644 --- a/dlls/kernel32/nls/ivl.nls +++ b/dlls/kernel32/nls/ivl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_INVARIANT, SUBLANG_NEUTRAL LOCALE_SLONGDATE "dddd, dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/jpn.nls b/dlls/kernel32/nls/jpn.nls index 8025f6b2658..ea0a9bfbe30 100644 --- a/dlls/kernel32/nls/jpn.nls +++ b/dlls/kernel32/nls/jpn.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy'年'M'月'd'日'" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "1月" LOCALE_SMONTHNAME2 "2月" LOCALE_SMONTHNAME3 "3月" diff --git a/dlls/kernel32/nls/kan.nls b/dlls/kernel32/nls/kan.nls index 15a45cbf203..aa808a1acfc 100644 --- a/dlls/kernel32/nls/kan.nls +++ b/dlls/kernel32/nls/kan.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ಜನವರೀ" LOCALE_SMONTHNAME2 "ಫೆಬ್ರವರೀ" LOCALE_SMONTHNAME3 "ಮಾರ್ಚ್" diff --git a/dlls/kernel32/nls/kat.nls b/dlls/kernel32/nls/kat.nls index 0d366acc934..6b3f8c8a0b5 100644 --- a/dlls/kernel32/nls/kat.nls +++ b/dlls/kernel32/nls/kat.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_GEORGIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy 'წლის' dd MM, dddd" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MM" LOCALE_SMONTHNAME1 "იანვარი" LOCALE_SMONTHNAME2 "თებერვალი" LOCALE_SMONTHNAME3 "მარტი" diff --git a/dlls/kernel32/nls/kkz.nls b/dlls/kernel32/nls/kkz.nls index 65808f53c15..227d3d093f7 100644 --- a/dlls/kernel32/nls/kkz.nls +++ b/dlls/kernel32/nls/kkz.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KAZAK, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy 'ж.'" LOCALE_SMONDECIMALSEP "-" LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 L"\x049b\x0430\x04a3\x0442\x0430\x0440" LOCALE_SMONTHNAME2 L"\x0430\x049b\x043f\x0430\x043d" LOCALE_SMONTHNAME3 "наурыз" diff --git a/dlls/kernel32/nls/knk.nls b/dlls/kernel32/nls/knk.nls index ac09939eafa..8bf8c37a7bd 100644 --- a/dlls/kernel32/nls/knk.nls +++ b/dlls/kernel32/nls/knk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KONKANI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "जानेवारी" LOCALE_SMONTHNAME2 "फेब्रुवारी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/kor.nls b/dlls/kernel32/nls/kor.nls index aceeb83a9c6..5a5a6ed3f4c 100644 --- a/dlls/kernel32/nls/kor.nls +++ b/dlls/kernel32/nls/kor.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_KOREAN LOCALE_SLONGDATE "yyyy'년' M'월' d'일' dddd" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'월' d'일'" LOCALE_SMONTHNAME1 "1월" LOCALE_SMONTHNAME2 "2월" LOCALE_SMONTHNAME3 "3월" diff --git a/dlls/kernel32/nls/kyr.nls b/dlls/kernel32/nls/kyr.nls index a4939e0a56e..fa0a578cde1 100644 --- a/dlls/kernel32/nls/kyr.nls +++ b/dlls/kernel32/nls/kyr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_KYRGYZ, SUBLANG_DEFAULT LOCALE_SLONGDATE "d'-'MMMM yyyy'-ж.'" LOCALE_SMONDECIMALSEP "-" LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Январь" LOCALE_SMONTHNAME2 "Февраль" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls index 21332f7df17..f2b2c3687a1 100644 --- a/dlls/kernel32/nls/lth.nls +++ b/dlls/kernel32/nls/lth.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SLONGDATE "yyyy 'm.' MMMM d 'd.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM d 'd.'" LOCALE_SMONTHNAME1 "sausis\0sausio" LOCALE_SMONTHNAME2 "vasaris\0vasario" LOCALE_SMONTHNAME3 "kovas\0kovo" diff --git a/dlls/kernel32/nls/lvi.nls b/dlls/kernel32/nls/lvi.nls index 226e0fd7f38..d561adec9f6 100644 --- a/dlls/kernel32/nls/lvi.nls +++ b/dlls/kernel32/nls/lvi.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, yyyy'. gada 'd. MMMM" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "janvāris" LOCALE_SMONTHNAME2 "februāris" LOCALE_SMONTHNAME3 "marts" diff --git a/dlls/kernel32/nls/mar.nls b/dlls/kernel32/nls/mar.nls index 49e847c6008..39c46d7c3f8 100644 --- a/dlls/kernel32/nls/mar.nls +++ b/dlls/kernel32/nls/mar.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "जानेवारी" LOCALE_SMONTHNAME2 "फेब्रुवारी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/mki.nls b/dlls/kernel32/nls/mki.nls index 979430a78b5..64ae4afa922 100644 --- a/dlls/kernel32/nls/mki.nls +++ b/dlls/kernel32/nls/mki.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MACEDONIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "јануари" LOCALE_SMONTHNAME2 "февруари" LOCALE_SMONTHNAME3 "март" diff --git a/dlls/kernel32/nls/mon.nls b/dlls/kernel32/nls/mon.nls index b67e4b8243a..47787a7288e 100644 --- a/dlls/kernel32/nls/mon.nls +++ b/dlls/kernel32/nls/mon.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MONGOLIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy 'оны' MMMM d" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 L"1\x00a0\x0434\x04af\x0433\x044d\x044d\x0440\x00a0\x0441\x0430\x0440" LOCALE_SMONTHNAME2 "2 дугаар сар" LOCALE_SMONTHNAME3 "3 дугаар сар" diff --git a/dlls/kernel32/nls/msb.nls b/dlls/kernel32/nls/msb.nls index f665bb75316..0a6f18a8a17 100644 --- a/dlls/kernel32/nls/msb.nls +++ b/dlls/kernel32/nls/msb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januari" LOCALE_SMONTHNAME2 "Februari" LOCALE_SMONTHNAME3 "Mac" diff --git a/dlls/kernel32/nls/msl.nls b/dlls/kernel32/nls/msl.nls index 53054c21317..90e877fad1a 100644 --- a/dlls/kernel32/nls/msl.nls +++ b/dlls/kernel32/nls/msl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_MALAYSIA LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Januari" LOCALE_SMONTHNAME2 "Februari" LOCALE_SMONTHNAME3 "Mac" diff --git a/dlls/kernel32/nls/nep.nls b/dlls/kernel32/nls/nep.nls index 0f6d0ee1761..7b5ae15e41d 100644 --- a/dlls/kernel32/nls/nep.nls +++ b/dlls/kernel32/nls/nep.nls @@ -103,6 +103,7 @@ STRINGTABLE LANGUAGE LANG_NEPALI, SUBLANG_NEPALI_NEPAL LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "जनवरी" LOCALE_SMONTHNAME2 "फेब्रुअरी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/nlb.nls b/dlls/kernel32/nls/nlb.nls index 9b66b32a768..2fc32e7d26e 100644 --- a/dlls/kernel32/nls/nlb.nls +++ b/dlls/kernel32/nls/nlb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_BELGIAN LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "maart" diff --git a/dlls/kernel32/nls/nld.nls b/dlls/kernel32/nls/nld.nls index 8f28f59960c..6c12aec6792 100644 --- a/dlls/kernel32/nls/nld.nls +++ b/dlls/kernel32/nls/nld.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "maart" diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls index 47c1260d1e6..e7a94931fd2 100644 --- a/dlls/kernel32/nls/nls.nls +++ b/dlls/kernel32/nls/nls.nls @@ -115,6 +115,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM LOCALE_SLONGDATE "dddd d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "maart" diff --git a/dlls/kernel32/nls/non.nls b/dlls/kernel32/nls/non.nls index e3284041680..6a52f2b514a 100644 --- a/dlls/kernel32/nls/non.nls +++ b/dlls/kernel32/nls/non.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/nor.nls b/dlls/kernel32/nls/nor.nls index f887978aab4..ffe216cd5a8 100644 --- a/dlls/kernel32/nls/nor.nls +++ b/dlls/kernel32/nls/nor.nls @@ -110,6 +110,7 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/pan.nls b/dlls/kernel32/nls/pan.nls index b562e5e6004..d6a17ea7817 100644 --- a/dlls/kernel32/nls/pan.nls +++ b/dlls/kernel32/nls/pan.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_PUNJABI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy dddd" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ਜਨਵਰੀ" LOCALE_SMONTHNAME2 "ਫ਼ਰਵਰੀ" LOCALE_SMONTHNAME3 "ਮਾਰਚ" diff --git a/dlls/kernel32/nls/plk.nls b/dlls/kernel32/nls/plk.nls index 8f0808ce2c7..bac0547bb17 100644 --- a/dlls/kernel32/nls/plk.nls +++ b/dlls/kernel32/nls/plk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "styczeń\0stycznia" LOCALE_SMONTHNAME2 "luty\0lutego" LOCALE_SMONTHNAME3 "marzec\0marca" diff --git a/dlls/kernel32/nls/ptb.nls b/dlls/kernel32/nls/ptb.nls index eb6fc513cb0..6c5199fa572 100644 --- a/dlls/kernel32/nls/ptb.nls +++ b/dlls/kernel32/nls/ptb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN LOCALE_SLONGDATE "dddd, d' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd' de 'MMMM" LOCALE_SMONTHNAME1 "janeiro" LOCALE_SMONTHNAME2 "fevereiro" LOCALE_SMONTHNAME3 "março" diff --git a/dlls/kernel32/nls/ptg.nls b/dlls/kernel32/nls/ptg.nls index ec71704f94e..ae0a843e7d1 100644 --- a/dlls/kernel32/nls/ptg.nls +++ b/dlls/kernel32/nls/ptg.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE LOCALE_SLONGDATE "dddd, d' de 'MMMM' de 'yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd/MM" LOCALE_SMONTHNAME1 "Janeiro" LOCALE_SMONTHNAME2 "Fevereiro" LOCALE_SMONTHNAME3 "Março" diff --git a/dlls/kernel32/nls/rmc.nls b/dlls/kernel32/nls/rmc.nls index 0277b5f5fe3..eebf2ddce8e 100644 --- a/dlls/kernel32/nls/rmc.nls +++ b/dlls/kernel32/nls/rmc.nls @@ -120,6 +120,7 @@ STRINGTABLE LANGUAGE LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND LOCALE_SLONGDATE "dddd, d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "schaner" LOCALE_SMONTHNAME2 "favrer" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/rom.nls b/dlls/kernel32/nls/rom.nls index 8cc965c5674..357293e563c 100644 --- a/dlls/kernel32/nls/rom.nls +++ b/dlls/kernel32/nls/rom.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "ianuarie" LOCALE_SMONTHNAME2 "februarie" LOCALE_SMONTHNAME3 "martie" diff --git a/dlls/kernel32/nls/rus.nls b/dlls/kernel32/nls/rus.nls index fcb55bb80a8..4d14af2c7d7 100644 --- a/dlls/kernel32/nls/rus.nls +++ b/dlls/kernel32/nls/rus.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy 'г.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "Январь\0января" LOCALE_SMONTHNAME2 "Февраль\0февраля" LOCALE_SMONTHNAME3 "Март\0марта" diff --git a/dlls/kernel32/nls/san.nls b/dlls/kernel32/nls/san.nls index 992d80cc188..5fca61335b1 100644 --- a/dlls/kernel32/nls/san.nls +++ b/dlls/kernel32/nls/san.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy dddd" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "जनवरी" LOCALE_SMONTHNAME2 "फरवरी" LOCALE_SMONTHNAME3 "मार्च" diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 033dbc0d7ea..9b74ca12f6d 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA LOCALE_SLONGDATE "yyyy MMMM dd" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "ජනවාරි" LOCALE_SMONTHNAME2 "පෙබරවාරි" LOCALE_SMONTHNAME3 "මාර්තු" diff --git a/dlls/kernel32/nls/sky.nls b/dlls/kernel32/nls/sky.nls index ec04973f9c2..adc363253fc 100644 --- a/dlls/kernel32/nls/sky.nls +++ b/dlls/kernel32/nls/sky.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "január" LOCALE_SMONTHNAME2 "február" LOCALE_SMONTHNAME3 "marec" diff --git a/dlls/kernel32/nls/slv.nls b/dlls/kernel32/nls/slv.nls index 3d0790c0e71..63181e4d0a2 100644 --- a/dlls/kernel32/nls/slv.nls +++ b/dlls/kernel32/nls/slv.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "marec" diff --git a/dlls/kernel32/nls/sqi.nls b/dlls/kernel32/nls/sqi.nls index 7fda7bd589f..c269e16f0eb 100644 --- a/dlls/kernel32/nls/sqi.nls +++ b/dlls/kernel32/nls/sqi.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "yyyy-MM-dd" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "janar" LOCALE_SMONTHNAME2 "shkurt" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 348cf405239..4d1049be44b 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "јануар" LOCALE_SMONTHNAME2 "фебруар" LOCALE_SMONTHNAME3 "март" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index 2566b17b489..fb6ba8b178d 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SLONGDATE "d. MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "mart" diff --git a/dlls/kernel32/nls/sve.nls b/dlls/kernel32/nls/sve.nls index 52db021b192..442de8db8a3 100644 --- a/dlls/kernel32/nls/sve.nls +++ b/dlls/kernel32/nls/sve.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH LOCALE_SLONGDATE "'den 'd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "'den 'd MMMM" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/svf.nls b/dlls/kernel32/nls/svf.nls index e92fc6ab175..2e71b98595d 100644 --- a/dlls/kernel32/nls/svf.nls +++ b/dlls/kernel32/nls/svf.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND LOCALE_SLONGDATE "'den 'd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "'den 'd MMMM" LOCALE_SMONTHNAME1 "januari" LOCALE_SMONTHNAME2 "februari" LOCALE_SMONTHNAME3 "mars" diff --git a/dlls/kernel32/nls/swk.nls b/dlls/kernel32/nls/swk.nls index b5c32e4b180..30220608cf2 100644 --- a/dlls/kernel32/nls/swk.nls +++ b/dlls/kernel32/nls/swk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SWAHILI, SUBLANG_DEFAULT LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "MMMM dd" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/syr.nls b/dlls/kernel32/nls/syr.nls index 4f84b8dc5e6..9209992d055 100644 --- a/dlls/kernel32/nls/syr.nls +++ b/dlls/kernel32/nls/syr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ܟܢܘܢ ܐܚܪܝ" LOCALE_SMONTHNAME2 "ܫܒܛ" LOCALE_SMONTHNAME3 "ܐܕܪ" diff --git a/dlls/kernel32/nls/tam.nls b/dlls/kernel32/nls/tam.nls index c860016cd0b..7da8a8f964d 100644 --- a/dlls/kernel32/nls/tam.nls +++ b/dlls/kernel32/nls/tam.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_TAMIL, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "ஜனவரி" LOCALE_SMONTHNAME2 "பெப்ரவரி" LOCALE_SMONTHNAME3 "மார்ச்" diff --git a/dlls/kernel32/nls/tel.nls b/dlls/kernel32/nls/tel.nls index 6c96d3e0185..1c7b92d375b 100644 --- a/dlls/kernel32/nls/tel.nls +++ b/dlls/kernel32/nls/tel.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "జనవరి" LOCALE_SMONTHNAME2 "ఫిబ్రవరి" LOCALE_SMONTHNAME3 "మార్చి" diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 9ffce8c3295..42ea7c04aaa 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "มกราคม" LOCALE_SMONTHNAME2 "กุมภาพันธ์" LOCALE_SMONTHNAME3 "มีนาคม" diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls index 57184e5f254..8f12d35153d 100644 --- a/dlls/kernel32/nls/trk.nls +++ b/dlls/kernel32/nls/trk.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy dddd" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "Ocak" LOCALE_SMONTHNAME2 "Şubat" LOCALE_SMONTHNAME3 "Mart" diff --git a/dlls/kernel32/nls/ttt.nls b/dlls/kernel32/nls/ttt.nls index 86236d91e3d..329954fb3c4 100644 --- a/dlls/kernel32/nls/ttt.nls +++ b/dlls/kernel32/nls/ttt.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Гыйнварь" LOCALE_SMONTHNAME2 "Февраль" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls index b5e608015f2..06ba29f808e 100644 --- a/dlls/kernel32/nls/ukr.nls +++ b/dlls/kernel32/nls/ukr.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy' р.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d MMMM" LOCALE_SMONTHNAME1 "Січень\0січня" LOCALE_SMONTHNAME2 "Лютий\0лютого" LOCALE_SMONTHNAME3 "Березень\0березня" diff --git a/dlls/kernel32/nls/urd.nls b/dlls/kernel32/nls/urd.nls index 08e8a8deaef..e44ab6a7ea0 100644 --- a/dlls/kernel32/nls/urd.nls +++ b/dlls/kernel32/nls/urd.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_URDU, SUBLANG_URDU_PAKISTAN LOCALE_SLONGDATE "dd MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "جنورى" LOCALE_SMONTHNAME2 "فرورى" LOCALE_SMONTHNAME3 "مارچ" diff --git a/dlls/kernel32/nls/uzb.nls b/dlls/kernel32/nls/uzb.nls index 7d0b4a8ac36..fa017079379 100644 --- a/dlls/kernel32/nls/uzb.nls +++ b/dlls/kernel32/nls/uzb.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC LOCALE_SLONGDATE "yyyy 'йил' d-MMMM" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d-MMMM" LOCALE_SMONTHNAME1 "Январ" LOCALE_SMONTHNAME2 "Феврал" LOCALE_SMONTHNAME3 "Март" diff --git a/dlls/kernel32/nls/uzl.nls b/dlls/kernel32/nls/uzl.nls index 1989bd7cb74..affd82b483b 100644 --- a/dlls/kernel32/nls/uzl.nls +++ b/dlls/kernel32/nls/uzl.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_LATIN LOCALE_SLONGDATE "yyyy 'yil' d-MMMM" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d-MMMM" LOCALE_SMONTHNAME1 "yanvar" LOCALE_SMONTHNAME2 "fevral" LOCALE_SMONTHNAME3 "mart" diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index a2574b6b033..573b0260bd9 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" LOCALE_SMONTHNAME1 "tháng một" LOCALE_SMONTHNAME2 "tháng hai" LOCALE_SMONTHNAME3 "tháng ba" diff --git a/dlls/kernel32/nls/wal.nls b/dlls/kernel32/nls/wal.nls index e39c5bf4a6c..3723aeb51ef 100644 --- a/dlls/kernel32/nls/wal.nls +++ b/dlls/kernel32/nls/wal.nls @@ -108,6 +108,7 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SLIST ";" LOCALE_SLONGDATE "Li ddd d di MMMM yyyy" LOCALE_SMONDECIMALSEP "," + LOCALE_SLONGDATE "MMMM dd" LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "djanvî" LOCALE_SMONTHNAME2 "fevrî" diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls index 2d49998ef5b..720261cd328 100644 --- a/dlls/kernel32/nls/zhh.nls +++ b/dlls/kernel32/nls/zhh.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_SLONGDATE "dddd, d MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "January" LOCALE_SMONTHNAME2 "February" LOCALE_SMONTHNAME3 "March" diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls index d8013dcc1c8..2017b87f0c5 100644 --- a/dlls/kernel32/nls/zhi.nls +++ b/dlls/kernel32/nls/zhi.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE LOCALE_SLONGDATE "dddd, d MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "一月" LOCALE_SMONTHNAME2 "二月" LOCALE_SMONTHNAME3 "三月" diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls index 956008dabb0..c9a6f143555 100644 --- a/dlls/kernel32/nls/zhm.nls +++ b/dlls/kernel32/nls/zhm.nls @@ -109,6 +109,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_SLONGDATE "dddd, d MMMM, yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "M'月'd'日'" LOCALE_SMONTHNAME1 "一月" LOCALE_SMONTHNAME2 "二月" LOCALE_SMONTHNAME3 "三月" -- 2.17.0

2 5

[PATCH V3 1/2] server: Add default security descriptor ownership for processes.
by Vijay Kiran Kamuju 22 Apr '19

22 Apr '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> Rename key_default_sd to process_default_sd and rebase properly. From: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 35 ++++++++++++++++++++++++++++++++++ server/process.c | 27 +++++++++++++++++++++++++- server/security.h | 1 + server/token.c | 2 ++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64da8b..3097a64fb24 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4682,11 +4682,15 @@ static void test_acls(void) static void test_GetSecurityInfo(void) { + char domain_users_ptr[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + PSID domain_users_sid = (PSID) domain_users_ptr, domain_sid; + SID_IDENTIFIER_AUTHORITY sia = { SECURITY_NT_AUTHORITY }; DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); PSID admin_sid = (PSID) admin_ptr, user_sid; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + BOOL owner_defaulted, group_defaulted; ACL_SIZE_INFORMATION acl_size; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; @@ -4813,6 +4817,37 @@ static void test_GetSecurityInfo(void) } LocalFree(pSD); CloseHandle(obj); + + /* Obtain the "domain users" SID from the user SID */ + if (!AllocateAndInitializeSid(&sia, 4, *GetSidSubAuthority(user_sid, 0), + *GetSidSubAuthority(user_sid, 1), + *GetSidSubAuthority(user_sid, 2), + *GetSidSubAuthority(user_sid, 3), 0, 0, 0, 0, &domain_sid)) + { + win_skip("Failed to get current domain SID\n"); + return; + } + sid_size = sizeof(domain_users_ptr); + pCreateWellKnownSid(WinAccountDomainUsersSid, domain_sid, domain_users_sid, &sid_size); + FreeSid(domain_sid); + + /* Test querying the ownership of a process */ + ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!ret, "GetNamedSecurityInfo failed with error %d\n", ret); + + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + ok(owner != NULL, "owner should not be NULL\n"); + ok(EqualSid(owner, admin_sid) || EqualSid(owner, user_sid), + "Process owner SID != Administrators SID.\n"); + + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + ok(group != NULL, "group should not be NULL\n"); + ok(EqualSid(group, domain_users_sid), "Process group SID != Domain Users SID.\n"); + LocalFree(pSD); } static void test_GetSidSubAuthority(void) diff --git a/server/process.c b/server/process.c index 4a1cebf2fca..f8a23b2cc53 100644 --- a/server/process.c +++ b/server/process.c @@ -63,6 +63,7 @@ static void process_dump( struct object *obj, int verbose ); static struct object_type *process_get_type( struct object *obj ); static int process_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int process_map_access( struct object *obj, unsigned int access ); +static struct security_descriptor *process_get_sd( struct object *obj ); static void process_poll_event( struct fd *fd, int event ); static struct list *process_get_kernel_obj_list( struct object *obj ); static void process_destroy( struct object *obj ); @@ -80,7 +81,7 @@ static const struct object_ops process_ops = no_signal, /* signal */ no_get_fd, /* get_fd */ process_map_access, /* map_access */ - default_get_sd, /* get_sd */ + process_get_sd, /* get_sd */ default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ @@ -663,12 +664,36 @@ static unsigned int process_map_access( struct object *obj, unsigned int access return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } + static struct list *process_get_kernel_obj_list( struct object *obj ) { struct process *process = (struct process *)obj; return &process->kernel_object; } +static struct security_descriptor *process_get_sd( struct object *obj ) +{ + static struct security_descriptor *process_default_sd; + + if (obj->sd) return obj->sd; + + if (!process_default_sd) + { + size_t users_sid_len = security_sid_len( security_domain_users_sid ); + size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + + process_default_sd = mem_alloc( sizeof(*process_default_sd) + admins_sid_len + users_sid_len ); + process_default_sd->control = SE_DACL_PRESENT; + process_default_sd->owner_len = admins_sid_len; + process_default_sd->group_len = users_sid_len; + process_default_sd->sacl_len = 0; + process_default_sd->dacl_len = 0; + memcpy( process_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); + memcpy( (char *)(process_default_sd + 1) + admins_sid_len, security_domain_users_sid, users_sid_len ); + } + return process_default_sd; +} + static void process_poll_event( struct fd *fd, int event ) { struct process *process = get_fd_user( fd ); diff --git a/server/security.h b/server/security.h index 873bbc6afd6..606dbb2ab2c 100644 --- a/server/security.h +++ b/server/security.h @@ -47,6 +47,7 @@ extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; +extern const PSID security_domain_users_sid; extern const PSID security_high_label_sid; diff --git a/server/token.c b/server/token.c index 5c35bcc19f6..895809e7252 100644 --- a/server/token.c +++ b/server/token.c @@ -83,6 +83,7 @@ static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORIT static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID, 0, 0 } }; +static const SID_N(5) domain_users_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, DOMAIN_GROUP_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -92,6 +93,7 @@ const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; +const PSID security_domain_users_sid = (PSID)&domain_users_sid; const PSID security_high_label_sid = (PSID)&high_label_sid; static luid_t prev_luid_value = { 1000, 0 }; -- 2.17.0

2 3

[PATCH] qcap: Fix a COM reference leak in the audiorecord test.
by Damjan Jovanovic 22 Apr '19

22 Apr '19

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/qcap/tests/audiorecord.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

2 3

[PATCH V2 1/2] server: Add default security descriptor ownership for processes.
by Vijay Kiran Kamuju 22 Apr '19

22 Apr '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> Rename key_default_sd to process_default_sd Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 35 ++++++++++++++++++++++++++++++++++ server/process.c | 26 ++++++++++++++++++++++++- server/security.h | 1 + server/token.c | 2 ++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64da8b..3097a64fb24 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4682,11 +4682,15 @@ static void test_acls(void) static void test_GetSecurityInfo(void) { + char domain_users_ptr[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + PSID domain_users_sid = (PSID) domain_users_ptr, domain_sid; + SID_IDENTIFIER_AUTHORITY sia = { SECURITY_NT_AUTHORITY }; DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); PSID admin_sid = (PSID) admin_ptr, user_sid; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + BOOL owner_defaulted, group_defaulted; ACL_SIZE_INFORMATION acl_size; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; @@ -4813,6 +4817,37 @@ static void test_GetSecurityInfo(void) } LocalFree(pSD); CloseHandle(obj); + + /* Obtain the "domain users" SID from the user SID */ + if (!AllocateAndInitializeSid(&sia, 4, *GetSidSubAuthority(user_sid, 0), + *GetSidSubAuthority(user_sid, 1), + *GetSidSubAuthority(user_sid, 2), + *GetSidSubAuthority(user_sid, 3), 0, 0, 0, 0, &domain_sid)) + { + win_skip("Failed to get current domain SID\n"); + return; + } + sid_size = sizeof(domain_users_ptr); + pCreateWellKnownSid(WinAccountDomainUsersSid, domain_sid, domain_users_sid, &sid_size); + FreeSid(domain_sid); + + /* Test querying the ownership of a process */ + ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!ret, "GetNamedSecurityInfo failed with error %d\n", ret); + + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + ok(owner != NULL, "owner should not be NULL\n"); + ok(EqualSid(owner, admin_sid) || EqualSid(owner, user_sid), + "Process owner SID != Administrators SID.\n"); + + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + ok(group != NULL, "group should not be NULL\n"); + ok(EqualSid(group, domain_users_sid), "Process group SID != Domain Users SID.\n"); + LocalFree(pSD); } static void test_GetSidSubAuthority(void) diff --git a/server/process.c b/server/process.c index 473d3b1a27a..d895fbacd7a 100644 --- a/server/process.c +++ b/server/process.c @@ -63,6 +63,7 @@ static void process_dump( struct object *obj, int verbose ); static struct object_type *process_get_type( struct object *obj ); static int process_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int process_map_access( struct object *obj, unsigned int access ); +static struct security_descriptor *process_get_sd( struct object *obj ); static void process_poll_event( struct fd *fd, int event ); static void process_destroy( struct object *obj ); static void terminate_process( struct process *process, struct thread *skip, int exit_code ); @@ -79,7 +80,7 @@ static const struct object_ops process_ops = no_signal, /* signal */ no_get_fd, /* get_fd */ process_map_access, /* map_access */ - default_get_sd, /* get_sd */ + process_get_sd, /* get_sd */ default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ @@ -661,6 +662,29 @@ static unsigned int process_map_access( struct object *obj, unsigned int access return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } +static struct security_descriptor *process_get_sd( struct object *obj ) +{ + static struct security_descriptor *process_default_sd; + + if (obj->sd) return obj->sd; + + if (!process_default_sd) + { + size_t users_sid_len = security_sid_len( security_domain_users_sid ); + size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + + process_default_sd = mem_alloc( sizeof(*process_default_sd) + admins_sid_len + users_sid_len ); + process_default_sd->control = SE_DACL_PRESENT; + process_default_sd->owner_len = admins_sid_len; + process_default_sd->group_len = users_sid_len; + process_default_sd->sacl_len = 0; + process_default_sd->dacl_len = 0; + memcpy( process_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); + memcpy( (char *)(process_default_sd + 1) + admins_sid_len, security_domain_users_sid, users_sid_len ); + } + return process_default_sd; +} + static void process_poll_event( struct fd *fd, int event ) { struct process *process = get_fd_user( fd ); diff --git a/server/security.h b/server/security.h index 873bbc6afd6..606dbb2ab2c 100644 --- a/server/security.h +++ b/server/security.h @@ -47,6 +47,7 @@ extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; +extern const PSID security_domain_users_sid; extern const PSID security_high_label_sid; diff --git a/server/token.c b/server/token.c index 5c35bcc19f6..895809e7252 100644 --- a/server/token.c +++ b/server/token.c @@ -83,6 +83,7 @@ static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORIT static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID, 0, 0 } }; +static const SID_N(5) domain_users_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, DOMAIN_GROUP_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -92,6 +93,7 @@ const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; +const PSID security_domain_users_sid = (PSID)&domain_users_sid; const PSID security_high_label_sid = (PSID)&high_label_sid; static luid_t prev_luid_value = { 1000, 0 }; -- 2.17.0

2 3

[PATCH 1/2] server: Add default security descriptor ownership for processes.
by Vijay Kiran Kamuju 22 Apr '19

22 Apr '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> From: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 35 ++++++++++++++++++++++++++++++++++ server/process.c | 26 ++++++++++++++++++++++++- server/security.h | 1 + server/token.c | 2 ++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64da8b..3097a64fb24 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4682,11 +4682,15 @@ static void test_acls(void) static void test_GetSecurityInfo(void) { + char domain_users_ptr[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + PSID domain_users_sid = (PSID) domain_users_ptr, domain_sid; + SID_IDENTIFIER_AUTHORITY sia = { SECURITY_NT_AUTHORITY }; DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); PSID admin_sid = (PSID) admin_ptr, user_sid; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + BOOL owner_defaulted, group_defaulted; ACL_SIZE_INFORMATION acl_size; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; @@ -4813,6 +4817,37 @@ static void test_GetSecurityInfo(void) } LocalFree(pSD); CloseHandle(obj); + + /* Obtain the "domain users" SID from the user SID */ + if (!AllocateAndInitializeSid(&sia, 4, *GetSidSubAuthority(user_sid, 0), + *GetSidSubAuthority(user_sid, 1), + *GetSidSubAuthority(user_sid, 2), + *GetSidSubAuthority(user_sid, 3), 0, 0, 0, 0, &domain_sid)) + { + win_skip("Failed to get current domain SID\n"); + return; + } + sid_size = sizeof(domain_users_ptr); + pCreateWellKnownSid(WinAccountDomainUsersSid, domain_sid, domain_users_sid, &sid_size); + FreeSid(domain_sid); + + /* Test querying the ownership of a process */ + ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!ret, "GetNamedSecurityInfo failed with error %d\n", ret); + + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + ok(owner != NULL, "owner should not be NULL\n"); + ok(EqualSid(owner, admin_sid) || EqualSid(owner, user_sid), + "Process owner SID != Administrators SID.\n"); + + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + ok(group != NULL, "group should not be NULL\n"); + ok(EqualSid(group, domain_users_sid), "Process group SID != Domain Users SID.\n"); + LocalFree(pSD); } static void test_GetSidSubAuthority(void) diff --git a/server/process.c b/server/process.c index 473d3b1a27a..f7af438b561 100644 --- a/server/process.c +++ b/server/process.c @@ -63,6 +63,7 @@ static void process_dump( struct object *obj, int verbose ); static struct object_type *process_get_type( struct object *obj ); static int process_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int process_map_access( struct object *obj, unsigned int access ); +static struct security_descriptor *process_get_sd( struct object *obj ); static void process_poll_event( struct fd *fd, int event ); static void process_destroy( struct object *obj ); static void terminate_process( struct process *process, struct thread *skip, int exit_code ); @@ -79,7 +80,7 @@ static const struct object_ops process_ops = no_signal, /* signal */ no_get_fd, /* get_fd */ process_map_access, /* map_access */ - default_get_sd, /* get_sd */ + process_get_sd, /* get_sd */ default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ @@ -661,6 +662,29 @@ static unsigned int process_map_access( struct object *obj, unsigned int access return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } +static struct security_descriptor *process_get_sd( struct object *obj ) +{ + static struct security_descriptor *key_default_sd; + + if (obj->sd) return obj->sd; + + if (!key_default_sd) + { + size_t users_sid_len = security_sid_len( security_domain_users_sid ); + size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + + key_default_sd = mem_alloc( sizeof(*key_default_sd) + admins_sid_len + users_sid_len ); + key_default_sd->control = SE_DACL_PRESENT; + key_default_sd->owner_len = admins_sid_len; + key_default_sd->group_len = users_sid_len; + key_default_sd->sacl_len = 0; + key_default_sd->dacl_len = 0; + memcpy( key_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); + memcpy( (char *)(key_default_sd + 1) + admins_sid_len, security_domain_users_sid, users_sid_len ); + } + return key_default_sd; +} + static void process_poll_event( struct fd *fd, int event ) { struct process *process = get_fd_user( fd ); diff --git a/server/security.h b/server/security.h index 873bbc6afd6..606dbb2ab2c 100644 --- a/server/security.h +++ b/server/security.h @@ -47,6 +47,7 @@ extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; +extern const PSID security_domain_users_sid; extern const PSID security_high_label_sid; diff --git a/server/token.c b/server/token.c index 5c35bcc19f6..895809e7252 100644 --- a/server/token.c +++ b/server/token.c @@ -83,6 +83,7 @@ static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORIT static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID, 0, 0 } }; +static const SID_N(5) domain_users_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, DOMAIN_GROUP_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -92,6 +93,7 @@ const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; +const PSID security_domain_users_sid = (PSID)&domain_users_sid; const PSID security_high_label_sid = (PSID)&high_label_sid; static luid_t prev_luid_value = { 1000, 0 }; -- 2.17.0

3 7

[PATCH] qcap/tests: Fix a COM reference leak in the audiorecord test.
by Zebediah Figura 22 Apr '19

22 Apr '19

From: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/tests/audiorecord.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index 5de019896c..af27017504 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -152,6 +152,7 @@ START_TEST(audiorecord) IMoniker *mon; WCHAR *name; HRESULT hr; + ULONG ref; CoInitialize(NULL); @@ -182,6 +183,8 @@ START_TEST(audiorecord) test_interfaces(filter); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); IMoniker_Release(mon); } -- 2.21.0

1 0

[PATCH] explorer: Create CurrentControlSet\Control\Video registry key as non-volatile.
by Vijay Kiran Kamuju 22 Apr '19

22 Apr '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/registry.c | 7 +++++++ programs/explorer/desktop.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d1fe3f05fe5..011c2fcea1c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1345,6 +1345,13 @@ static void test_reg_create_key(void) RegDeleteKeyA(hkey1, ""); RegCloseKey(hkey1); + /* System\CurrentControlSet\Control\Video should be non-volatile */ + ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Video\\Wine", + 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); + ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %d\n", ret); + RegDeleteKeyA(hkey1, ""); + RegCloseKey(hkey1); + /* WOW64 flags - open an existing key */ hkey1 = NULL; ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 27b9b249012..5424a194029 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -775,6 +775,11 @@ static BOOL get_default_enable_shell( const WCHAR *name ) static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { + static const WCHAR video_keyW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o',0}; static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -838,6 +843,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); } + /* create video key first without REG_OPTION_VOLATILE attribute */ + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, NULL )) + RegCloseKey( hkey ); + sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); -- 2.17.0

4 5

[PATCH 1/7] comctl32/tests: Avoid leaks by moving creation calls outside the loop
by Gabriel Ivăncescu 22 Apr '19

22 Apr '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/tests/button.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index f31f526..e0c4736 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1908,7 +1908,7 @@ static void test_bcm_get_ideal_size(void) { BS_SPLITBUTTON, extra_width * 2 + GetSystemMetrics(SM_CXEDGE) }, { BS_DEFSPLITBUTTON, extra_width * 2 + GetSystemMetrics(SM_CXEDGE) } }; - LONG image_width, height, line_count, text_width; + LONG image_width = 48, height = 48, line_count, text_width; HFONT hfont, prev_font; DWORD style, type; BOOL ret; @@ -1964,6 +1964,14 @@ static void test_bcm_get_ideal_size(void) return; } + /* Tests for image placements */ + /* Prepare bitmap */ + hdc = GetDC(0); + hmask = CreateCompatibleBitmap(hdc, image_width, height); + hbmp = CreateCompatibleBitmap(hdc, image_width, height); + himl = pImageList_Create(image_width, height, ILC_COLOR, 1, 1); + pImageList_Add(himl, hbmp, 0); + #define set_split_info(hwnd) do { \ BUTTON_SPLITINFO _info; \ int _ret; \ @@ -1976,14 +1984,6 @@ static void test_bcm_get_ideal_size(void) for (k = 0; k < ARRAY_SIZE(pushtype); k++) { - /* Tests for image placements */ - /* Prepare bitmap */ - image_width = 48; - height = 48; - hdc = GetDC(0); - hmask = CreateCompatibleBitmap(hdc, image_width, height); - hbmp = CreateCompatibleBitmap(hdc, image_width, height); - /* Only bitmap for push button, ideal size should be enough for image and text */ hwnd = CreateWindowA(WC_BUTTONA, button_text, pushtype[k].style | BS_BITMAP | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); @@ -2028,8 +2028,6 @@ static void test_bcm_get_ideal_size(void) } /* Image list alignments */ - himl = pImageList_Create(image_width, height, ILC_COLOR, 1, 1); - pImageList_Add(himl, hbmp, 0); biml.himl = himl; for (i = 0; i < ARRAY_SIZE(imagelist_aligns); i++) { @@ -2099,6 +2097,7 @@ static void test_bcm_get_ideal_size(void) image_width + text_width + pushtype[k].extra_width, size.cy, max(height, tm.tmHeight)); ok(size.cy < large_height, "Expect ideal cy %d < %d\n", size.cy, large_height); DestroyWindow(hwnd); + DestroyIcon(hicon); } #undef set_split_info @@ -2215,7 +2214,6 @@ static void test_bcm_get_ideal_size(void) } pImageList_Destroy(himl); - DestroyIcon(hicon); DeleteObject(hbmp); DeleteObject(hmask); ReleaseDC(0, hdc); -- 2.21.0

2 15

[PATCH resend] include/wine/unicode: Avoid scanning the entire string in memrchrW
by Gabriel Ivăncescu 22 Apr '19

22 Apr '19

Scanning backwards can avoid a full scan of the entire string and makes more sense since we are looking for the last char. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/wine/unicode.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index ff6f656..671f316 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -287,10 +287,9 @@ WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { - const WCHAR *end; - WCHAR *ret = NULL; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = (WCHAR *)(ULONG_PTR)ptr; - return ret; + const WCHAR *p; + for (p = ptr + n - 1; p >= ptr; p--) if (*p == ch) return (WCHAR *)(ULONG_PTR)p; + return NULL; } WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) -- 2.21.0

2 2

[PATCH] msxml3: put_output accepts DOMDocument destination
by Jefferson Carpenter 22 Apr '19

22 Apr '19

2 5

[PATCH] mfplay: Add a stub for MFPCreateMediaPlayer().
by Nikolay Sivov 22 Apr '19

22 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47016 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Stub seems to be enough, installation completes without errors, and Word starts fine. dlls/mfplay/mfplay.spec | 2 +- dlls/mfplay/player.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/mfplay.spec b/dlls/mfplay/mfplay.spec index 964b90af29..5593ebfc75 100644 --- a/dlls/mfplay/mfplay.spec +++ b/dlls/mfplay/mfplay.spec @@ -2,5 +2,5 @@ @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer -@ stub MFPCreateMediaPlayer +@ stdcall MFPCreateMediaPlayer(wstr long long ptr long ptr) @ stub MFPCreateMediaPlayerEx diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 8873f5273d..d75ccfb106 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -20,6 +20,11 @@ #include "windef.h" #include "winbase.h" +#include "mfplay.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { @@ -34,3 +39,11 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } + +HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, + IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player) +{ + FIXME("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, hwnd, player); + + return E_NOTIMPL; +} -- 2.20.1

1 0

[PATCH] msvcp140: Add _Resize implementation.
by Jacek Caban 22 Apr '19

22 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 22 ++++++++++++++++++++++ dlls/msvcp90/ios.c | 20 ++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)

2 1

[PATCH 7/7] winemac.drv: Handle display device change events.
by Zhiyi Zhang 22 Apr '19

22 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 6 ++++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 8b1ae523ee..2b6f671140 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1460,6 +1460,8 @@ void macdrv_displays_changed(const macdrv_event *event) free_display_mode_descriptor(desc); CGDisplayModeRelease(mode); + macdrv_init_display_devices(TRUE); + if (is_original && retina_enabled) { width *= 2; @@ -1759,7 +1761,7 @@ static void cleanup_devices(void) * * Return FALSE on failure and TRUE on success. */ -BOOL macdrv_init_display_devices(void) +BOOL macdrv_init_display_devices(BOOL force) { struct macdrv_gpu *gpus = NULL; struct macdrv_adapter *adapters = NULL; @@ -1781,7 +1783,7 @@ BOOL macdrv_init_display_devices(void) goto fail; /* Ensure only one thread is initializing the registry and avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) { ret = TRUE; goto fail; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index dca89b04f0..8519a1607f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -223,7 +223,7 @@ extern CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HIDDEN; extern void check_retina_status(void) DECLSPEC_HIDDEN; -extern BOOL macdrv_init_display_devices(void) DECLSPEC_HIDDEN; +extern BOOL macdrv_init_display_devices(BOOL force) DECLSPEC_HIDDEN; /************************************************************************** * Mac IME driver diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 0779952e9a..7d82e6fd3f 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -299,7 +299,7 @@ static BOOL process_attach(void) return FALSE; } - if (!macdrv_init_display_devices()) + if (!macdrv_init_display_devices(FALSE)) return FALSE; return TRUE; -- 2.15.2 (Apple Git-101.1)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel