June 2021 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Set the "compareEnable" field of struct VkSamplerCreateInfo to either 0 or 1.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: d0a38a32c77a05da0ee40b06461cfab4f5fdfdc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a38a32c77a05da0ee40b06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 11 13:54:32 2021 +0100 wined3d: Set the "compareEnable" field of struct VkSamplerCreateInfo to either 0 or 1. VkBool32 is (unfortunately) specified as 0/1, instead of zero/non-zero. Found by the validation layers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f969570c22829351f4afeabb4fee55adce799ad8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/sampler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 8d909627a18..74f00b808fa 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -200,7 +200,7 @@ static void wined3d_sampler_vk_cs_init(void *object) sampler_desc.mipLodBias = desc->lod_bias; sampler_desc.anisotropyEnable = desc->max_anisotropy != 1; sampler_desc.maxAnisotropy = desc->max_anisotropy; - sampler_desc.compareEnable = desc->compare; + sampler_desc.compareEnable = !!desc->compare; sampler_desc.compareOp = vk_compare_op_from_wined3d(desc->comparison_func); sampler_desc.minLod = desc->min_lod; sampler_desc.maxLod = desc->max_lod;

1 0

Roman Pišl : cmd: Fix handling of nested if-for expressions on a single line.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 907c5a2135b2c94f07b251ff51046cb66709c2c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=907c5a2135b2c94f07b251ff… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 8 19:06:43 2021 +0100 cmd: Fix handling of nested if-for expressions on a single line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50641 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6809e0599ef57d30f1a3f87f87cd006ea8d589be) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 10 ++++++++-- programs/cmd/tests/test_builtins.cmd | 4 ++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e99dd24ac72..0fb40d94e49 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1599,8 +1599,14 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, the same bracket depth as the IF, then the IF statement is over. This is required to handle nested ifs properly */ } else if (isIF && (*cmdList)->bracketDepth == myDepth) { - WINE_TRACE("Found end of this nested IF statement, ending this if\n"); - break; + static const WCHAR doW[] = {'d','o'}; + if (WCMD_keyword_ws_found(doW, ARRAY_SIZE(doW), (*cmdList)->command)) { + WINE_TRACE("Still inside FOR-loop, not an end of IF statement\n"); + *cmdList = (*cmdList)->nextcommand; + } else { + WINE_TRACE("Found end of this nested IF statement, ending this if\n"); + break; + } } else if (!processThese) { if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; WINE_TRACE("Skipping this command, as in not process mode (next = %p)\n", *cmdList); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c7418b759e4..4019c51ba73 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1242,6 +1242,10 @@ goto :eof set WINE_STR_PARMS= set WINE_INT_PARMS= +echo ------------ Testing if/for ------------ +if ""=="" for %%i in (A) DO (echo %%i) +if not ""=="" for %%i in (B) DO (echo %%i) + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index f75839fdbe8..129e5313d90 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -914,6 +914,8 @@ x(a)space@ --- x(a)space@ --- +------------ Testing if/for ------------ +A ------------ Testing for ------------ --- plain FOR A

1 0

Roman Pišl : cmd: Fix handling of brackets in if-set expressions on a single line.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 780b202907eb4de575b7772b73db1580fa463f92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=780b202907eb4de575b7772b… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 8 19:06:44 2021 +0100 cmd: Fix handling of brackets in if-set expressions on a single line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50642 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d6b0b67d91b6433744ec859b10b8ee8eb4a37b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ programs/cmd/wcmdmain.c | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4019c51ba73..7cd806c3d54 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1246,6 +1246,11 @@ echo ------------ Testing if/for ------------ if ""=="" for %%i in (A) DO (echo %%i) if not ""=="" for %%i in (B) DO (echo %%i) +echo ------------ Testing if/set ------------ +set x=C:\Program Files (x86) +if ""=="" set y=%x%\dummy +echo %y% + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 129e5313d90..bf5fcddeb9d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -916,6 +916,8 @@ x(a)space@ --- ------------ Testing if/for ------------ A +------------ Testing if/set ------------ +C:\Program Files (x86)\dummy ------------ Testing for ------------ --- plain FOR A diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index fbe8475d8a9..dd7d14e50e5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1817,6 +1817,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR forCmd[] = {'f','o','r'}; static const WCHAR ifCmd[] = {'i','f'}; static const WCHAR ifElse[] = {'e','l','s','e'}; + static const WCHAR setCmd[] = {'s','e','t'}; BOOL inOneLine = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; @@ -1829,6 +1830,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE BOOL lastWasElse = FALSE; BOOL lastWasRedirect = TRUE; BOOL lastWasCaret = FALSE; + BOOL ignoreBracket = FALSE; /* Some expressions after if (set) require */ + /* handling brackets as a normal character */ int lineCurDepth; /* Bracket depth when line was read in */ BOOL resetAtEndOfLine = FALSE; /* Do we need to reset curdepth at EOL */ @@ -1957,6 +1960,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curPos+=if_condition_len; } + if (WCMD_keyword_ws_found(setCmd, ARRAY_SIZE(setCmd), curPos)) + ignoreBracket = TRUE; + } else if (WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), curPos)) { const int keyw_len = ARRAY_SIZE(ifElse) + 1; inElse = TRUE; @@ -2146,7 +2152,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE In an ELSE statement, only allow it straight away after the ELSE and whitespace */ - } else if (inIf || + } else if ((inIf && !ignoreBracket) || (inElse && lastWasElse && onlyWhiteSpace) || (inFor && (lastWasIn || lastWasDo) && onlyWhiteSpace)) {

1 0

Bernhard Kölbl : msvcrt: Update source pointer in wcsrtombs in C locale.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 3224e39044106b56dfbc197ccfeeab65ba853080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3224e39044106b56dfbc197c… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 2 12:09:32 2021 +0100 msvcrt: Update source pointer in wcsrtombs in C locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3dca00f1dd7e8ff1abe0a15af3365b4f7c7ae042) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/string.c | 16 ++++++++++++++++ dlls/msvcrt/wcs.c | 3 +++ 2 files changed, 19 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4d61cff11c0..dbc93dc93f5 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2094,6 +2094,22 @@ static void test_mbstowcs(void) ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); ok(!mOut[0], "mOut = %s\n", mOut); + if(pwcsrtombs) { + pwstr = wSimple; + err = -3; + ret = pwcsrtombs(mOut, &pwstr, 4, &err); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(err == 0, "err = %d\n", err); + ok(pwstr == wSimple+4, "pwstr = %p (wszSimple = %p)\n", pwstr, wSimple); + ok(!memcmp(mOut, mSimple, ret), "mOut = %s\n", mOut); + + pwstr = wSimple; + ret = pwcsrtombs(mOut, &pwstr, 5, NULL); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(pwstr == NULL, "pwstr != NULL\n"); + ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + } + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9a30e0fe149..343dec70477 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -610,6 +610,9 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, mbstr[i] = (*wcstr)[i]; if(!(*wcstr)[i]) break; } + + if(i < count) *wcstr = NULL; + else *wcstr += i; return i; }

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 015f3167d8bf3319e0b619379841b94093c0e788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=015f3167d8bf3319e0b61937… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 3 12:27:44 2021 +0300 kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 816b588e0438f94a3769612739abc9d8d9980537) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/sync.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 2a47abf342c..7d6ac030299 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -21,6 +21,9 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winternl.h> @@ -60,6 +63,7 @@ static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER lis PSLIST_ENTRY last, ULONG count); static PSLIST_ENTRY (WINAPI *pRtlInterlockedPushListSListEx)(PSLIST_HEADER list, PSLIST_ENTRY first, PSLIST_ENTRY last, ULONG count); +static NTSTATUS (WINAPI *pNtQueueApcThread)(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR); #ifdef __i386__ @@ -2702,6 +2706,49 @@ static void test_crit_section(void) ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } +static DWORD WINAPI thread_proc(LPVOID unused) +{ + Sleep(INFINITE); + return 0; +} + +static void CALLBACK user_apc(ULONG_PTR unused) +{ +} + +static void CALLBACK call_user_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + PAPCFUNC func = (PAPCFUNC)arg1; + func(arg2); +} + +static void test_QueueUserAPC(void) +{ + HANDLE thread; + DWORD tid, ret; + + thread = CreateThread(NULL, 0, thread_proc, NULL, CREATE_SUSPENDED, &tid); + ok(thread != NULL, "CreateThread error %u\n", GetLastError()); + + ret = TerminateThread(thread, 0xdeadbeef); + ok(ret, "TerminateThread error %u\n", GetLastError()); + + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "got %u\n", ret); + + ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0); +todo_wine + ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); + + SetLastError(0xdeadbeef); + ret = QueueUserAPC(user_apc, thread, 0); + ok(!ret, "QueueUserAPC should fail\n"); +todo_wine + ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError()); + + CloseHandle(thread); +} + START_TEST(sync) { char **argv; @@ -2732,6 +2779,7 @@ START_TEST(sync) pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); + pNtQueueApcThread = (void *)GetProcAddress(hntdll, "NtQueueApcThread"); argc = winetest_get_mainargs( &argv ); if (argc >= 3) @@ -2744,6 +2792,8 @@ START_TEST(sync) } init_fastcall_thunk(); + + test_QueueUserAPC(); test_signalandwait(); test_mutex(); test_slist();

1 0

Dmitry Timoshkov : server: Set error to STATUS_UNSUCCESSFUL when the server fails to queue APC for a thread.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: b66571e730e137d3989737542b5971cc9112adf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b66571e730e137d398973754… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 3 12:27:47 2021 +0300 server: Set error to STATUS_UNSUCCESSFUL when the server fails to queue APC for a thread. I've left another case of returning STATUS_PROCESS_IS_TERMINATING since that's not covered by the tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50704 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 050dc49b3850a9cf807d995c2c8e8c3f244b9f11) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/sync.c | 2 -- server/thread.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 7d6ac030299..f1c5f01fa84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2737,13 +2737,11 @@ static void test_QueueUserAPC(void) ok(ret == WAIT_OBJECT_0, "got %u\n", ret); ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0); -todo_wine ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); SetLastError(0xdeadbeef); ret = QueueUserAPC(user_apc, thread, 0); ok(!ret, "QueueUserAPC should fail\n"); -todo_wine ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError()); CloseHandle(thread); diff --git a/server/thread.c b/server/thread.c index 942a8ff8389..1e32ef8e1fc 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1750,7 +1750,7 @@ DECL_HANDLER(queue_apc) if (thread) { - if (!queue_apc( NULL, thread, apc )) set_error( STATUS_THREAD_IS_TERMINATING ); + if (!queue_apc( NULL, thread, apc )) set_error( STATUS_UNSUCCESSFUL ); release_object( thread ); } else if (process)

1 0

Gijs Vermeulen : wmvcore: Upgrade to IWMSyncReader2.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: c4cf95c6f9ce81e829b4039b95bb0c0373aedbd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4cf95c6f9ce81e829b4039b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 1 12:15:28 2021 +0100 wmvcore: Upgrade to IWMSyncReader2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50740 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7fa74fa78e2f8fedeea6fa3c796f0f2eb202825e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmvcore/reader.c | 168 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 111 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4cf95c6f9ce81e829b4…

1 0

Dmitry Kislyuk : msctf: Quiet a spammy fixme in InputProcessorProfileMgr_GetActiveProfile.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: d94b4a494b12b642597a84a33eb866128081bfa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94b4a494b12b642597a84a3… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Mon Mar 1 18:31:26 2021 -0600 msctf: Quiet a spammy fixme in InputProcessorProfileMgr_GetActiveProfile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50744 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0712b6b1a08a01ee397035372345f1ad38abe393) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/inputprocessor.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 7cb59f94460..ac7fad67548 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -866,8 +866,14 @@ static HRESULT WINAPI InputProcessorProfileMgr_UnregisterProfile(ITfInputProcess static HRESULT WINAPI InputProcessorProfileMgr_GetActiveProfile(ITfInputProcessorProfileMgr *iface, REFGUID catid, TF_INPUTPROCESSORPROFILE *pProfile) { - InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(catid), pProfile); + static int once; + + if (!once++) + { + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(catid), pProfile); + } + return E_NOTIMPL; }

1 0

Piotr Caban : msvcp90: Add _Wcsxfrm implementation.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: dcecdf6a4684aed56b037abf470e120a4b3c7e0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcecdf6a4684aed56b037abf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 11:57:06 2021 +0100 msvcp90: Add _Wcsxfrm implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50401 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3657c8b8293a1a026c81aa9cf4c04b1884c133cd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 24 ++++++++++++++++++++++++ 10 files changed, 69 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index dd5ccfaf7e0..a05d20dea4e 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2969,7 +2969,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub __Wcrtomb_lk @ cdecl towctrans(long long) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 6a386237ed7..10c2216aebb 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3877,7 +3877,7 @@ @ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub _Xp_addh @ stub _Xp_addx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index fd42183beae..6f3e7b65f92 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3824,7 +3824,7 @@ @ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub _Xp_addh @ stub _Xp_addx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index b7662613b94..c35dcb2d427 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3824,7 +3824,7 @@ @ cdecl _Unlock_shared_ptr_spin_lock() msvcp120._Unlock_shared_ptr_spin_lock @ cdecl _Wcrtomb(ptr long ptr ptr) msvcp120._Wcrtomb @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) msvcp120._Wcscoll -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) msvcp120._Wcsxfrm # extern _Xbig @ stub _Xp_addh @ stub _Xp_addx diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 94dd37ad4b3..dcd062aa4fc 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3747,7 +3747,7 @@ @ stub _WStoldx @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) @ cdecl _Xtime_diff_to_millis(ptr) _Xtime_diff_to_millis @ cdecl _Xtime_diff_to_millis2(ptr ptr) _Xtime_diff_to_millis2 @ cdecl -ret64 _Xtime_get_ticks() _Xtime_get_ticks diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 422902375cd..0b371131613 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5153,7 +5153,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig # extern _Zero @ stub __Wcrtomb_lk diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index fa4d6eaf405..6505f893b50 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5779,7 +5779,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub __Stodx @ stub __Stofx diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6b547c384a4..b4ed8d5e75d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -12701,6 +12701,43 @@ size_t __cdecl _Strxfrm(char *dest, char *dest_end, const char *src, const char return len; } +size_t __cdecl _Wcsxfrm(wchar_t *dest, wchar_t *dest_end, + const wchar_t *src, const wchar_t *src_end, _Collvec *coll) +{ + size_t dest_len = dest_end - dest; + size_t src_len = src_end - src; + _Collvec cv; + LCID lcid; + int i, len; + + TRACE("(%p %p %p %p %p)\n", dest, dest_end, src, src_end, coll); + + if (coll) cv = *coll; + else getcoll(&cv); + +#if _MSVCP_VER < 110 + lcid = cv.handle; +#else + lcid = LocaleNameToLCID(cv.lc_name, 0); +#endif + + if (!lcid) + { + if (src_len > dest_len) return src_len; + memcpy(dest, src, src_len * sizeof(wchar_t)); + return src_len; + } + + len = LCMapStringW(lcid, LCMAP_SORTKEY, src, src_len, NULL, 0); + if (!len) return INT_MAX; + if (len > dest_len) return len; + + LCMapStringW(lcid, LCMAP_SORTKEY, src, src_len, dest, dest_len); + for (i = len - 1; i >= 0; i--) + dest[i] = ((BYTE*)dest)[i]; + return len; +} + DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base(a)std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp(a)locale@std@@") diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c38dd041af2..1fbabe3114c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6554,7 +6554,7 @@ @ cdecl _Towupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) -@ stub _Wcsxfrm +@ cdecl _Wcsxfrm(ptr ptr ptr ptr ptr) # extern _Xbig @ stub __Wcrtomb_lk @ cdecl towctrans(long long) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index d700b6d933c..9d6fe2b9bcc 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -106,6 +106,8 @@ static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); static void (__cdecl *p_locale__Locimp__Locimp_Addfac)(locale__Locimp*,locale_facet*,size_t); static size_t (__cdecl *p__Strxfrm)(char*, char*, const char*, const char*, const MSVCP__Collvec*); +static size_t (__cdecl *p__Wcsxfrm)(wchar_t*, wchar_t*, const wchar_t*, + const wchar_t*, const MSVCP__Collvec*); #undef __thiscall #ifdef __i386__ @@ -250,6 +252,7 @@ static BOOL init(void) SET(p_wctrans, "wctrans"); SET(p_towctrans, "towctrans"); SET(p__Strxfrm, "_Strxfrm"); + SET(p__Wcsxfrm, "_Wcsxfrm"); SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"); SET(p_std_Ctraits_float__Isnan, "?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z"); @@ -1110,6 +1113,26 @@ static void test__Strxfrm(void) ok(!strcmp(in, out), "out = %s\n", out); } +static void test__Wcsxfrm(void) +{ + const wchar_t in[] = L"abc"; + + MSVCP__Collvec coll; + wchar_t out[64]; + size_t ret; + + memset(&coll, 0, sizeof(coll)); + + out[0] = 'z'; + ret = p__Wcsxfrm(out, out + 1, in, in + 2, &coll); + ok(ret == 2, "ret = %d\n", (int)ret); + ok(out[0] == 'z', "out[0] = %x\n", out[0]); + + ret = p__Wcsxfrm(out, out + ARRAY_SIZE(out), in, in + 4, &coll); + ok(ret == 4, "ret = %d\n", (int)ret); + ok(!wcscmp(in, out), "out = %s\n", wine_dbgstr_w(out)); +} + START_TEST(misc) { if(!init()) @@ -1131,6 +1154,7 @@ START_TEST(misc) test_locale__Locimp__Locimp_Addfac(); test_raise_handler(); test__Strxfrm(); + test__Wcsxfrm(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Piotr Caban : ucrtbase: Fix _Syserror_map behavior on unknown error.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 66e06267c04605fb2c894ce04c0579a6f023139a URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e06267c04605fb2c894ce0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 2 18:13:11 2021 +0100 ucrtbase: Fix _Syserror_map behavior on unknown error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50407 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b54ab691a7a484b7ce3d38b2d77088fb8f946257) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 14 ++++++++++++++ dlls/msvcp140/tests/msvcp140.c | 15 +++++++++++++++ dlls/msvcp90/misc.c | 4 ++++ 3 files changed, 33 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 54d959b694c..35e90cfa29c 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -216,6 +216,7 @@ static void (CDECL *p__Do_call)(void *this); static short (__cdecl *p__Dtest)(double *d); static short (__cdecl *p__Dscale)(double *d, int exp); static short (__cdecl *p__FExp)(float *x, float y, int exp); +static const char* (__cdecl *p__Syserror_map)(int err); /* filesystem */ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); @@ -575,6 +576,8 @@ static BOOL init(void) "?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00(a)Z"); SET(p_vector_base_v4__Internal_resize, "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00P6AXPEAX0(a)ZP6AX1PEBX0@Z3(a)Z"); + SET(p__Syserror_map, + "?_Syserror_map(a)std@@YAPEBDH(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -648,6 +651,8 @@ static BOOL init(void) "?_Mtx_unlock(a)threads@stdext@@YAXPAX(a)Z"); SET(p_vector_base_v4__Segment_index_of, "?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z"); + SET(p__Syserror_map, + "?_Syserror_map(a)std@@YAPBDH(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -1170,6 +1175,14 @@ static void test__FExp(void) ok(ret == FP_NORMAL, "ret = %x\n", ret); } +static void test__Syserror_map(void) +{ + const char *r; + + r = p__Syserror_map(0); + ok(!r, "_Syserror_map(0) returned %p\n", r); +} + static void test_tr2_sys__File_size(void) { ULONGLONG val; @@ -3306,6 +3319,7 @@ START_TEST(msvcp120) test__Dtest(); test__Dscale(); test__FExp(); + test__Syserror_map(); test_tr2_sys__File_size(); test_tr2_sys__Equivalent(); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index ae21feaf9e4..8a3771842a0 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -196,6 +196,7 @@ static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); static ULONG (__cdecl *p__Winerror_message)(ULONG, char*, ULONG); static int (__cdecl *p__Winerror_map)(int); +static const char* (__cdecl *p__Syserror_map)(int err); static BOOLEAN (WINAPI *pCreateSymbolicLinkW)(const WCHAR *, const WCHAR *, DWORD); @@ -234,6 +235,7 @@ static BOOL init(void) SET(p__Reschedule_chore, "?_Reschedule_chore(a)details@Concurrency@@YAHPEBU_Threadpool_chore(a)12@@Z"); SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPEAU_Threadpool_chore(a)12@@Z"); SET(p__Winerror_message, "?_Winerror_message(a)std@@YAKKPEADK(a)Z"); + SET(p__Syserror_map, "?_Syserror_map(a)std@@YAPEBDH(a)Z"); } else { #ifdef __arm__ SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAA(a)XZ"); @@ -264,6 +266,7 @@ static BOOL init(void) SET(p__Reschedule_chore, "?_Reschedule_chore(a)details@Concurrency@@YAHPBU_Threadpool_chore(a)12@@Z"); SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); SET(p__Winerror_message, "?_Winerror_message(a)std@@YAKKPADK(a)Z"); + SET(p__Syserror_map, "?_Syserror_map(a)std@@YAPBDH(a)Z"); } SET(p_Close_dir, "_Close_dir"); @@ -1314,6 +1317,17 @@ static void test__Winerror_map(void) } } +static void test__Syserror_map(void) +{ + const char *r1, *r2; + + r1 = p__Syserror_map(0); + ok(r1 != NULL, "_Syserror_map(0) returned NULL\n"); + r2 = p__Syserror_map(1234); + ok(r2 != NULL, "_Syserror_map(1234) returned NULL\n"); + ok(r1 == r2, "r1 = %p(%s), r2 = %p(%s)\n", r1, r1, r2, r2); +} + static void test_Equivalent(void) { int val, i; @@ -1391,6 +1405,7 @@ START_TEST(msvcp140) test_Last_write_time(); test__Winerror_message(); test__Winerror_map(); + test__Syserror_map(); test_Equivalent(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 76f730c2344..f70de9e5600 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2864,7 +2864,11 @@ const char* __cdecl _Syserror_map(int err) if(syserror_map[i].err == err) return syserror_map[i].str; } +#if _MSVCP_VER >= 140 + return "unknown error"; +#else return NULL; +#endif } #endif

1 0