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

Alex Henrie : kernel32: Fix return type of GetMaximumProcessorGroupCount.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 0cd033a07e7e3896fa6d8733d34a69ddb54c75b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd033a07e7e3896fa6d8733… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:40 2021 -0600 kernel32: Fix return type of GetMaximumProcessorGroupCount. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b31d73bc5a5..9041b00d512 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -638,7 +638,7 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) /*********************************************************************** * GetMaximumProcessorGroupCount (KERNEL32.@) */ -DWORD WINAPI GetMaximumProcessorGroupCount(void) +WORD WINAPI GetMaximumProcessorGroupCount(void) { FIXME("semi-stub, always returning 1\n"); return 1;

1 0

Alex Henrie : kernel32: Reimplement GetActiveProcessorGroupCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 59e9a8ecf3b3ec5e81aa12fa53418ee036710ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e9a8ecf3b3ec5e81aa12fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:41 2021 -0600 kernel32: Reimplement GetActiveProcessorGroupCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9041b00d512..710dfad8b7a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -609,8 +609,24 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK */ WORD WINAPI GetActiveProcessorGroupCount(void) { - FIXME("semi-stub, always returning 1\n"); - return 1; + WORD groups; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; + + TRACE("()\n"); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + groups = info->Group.ActiveGroupCount; + + HeapFree(GetProcessHeap(), 0, info); + return groups; } /***********************************************************************

1 0

Alex Henrie : kernel32: Reimplement GetActiveProcessorCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 6aeb297d20c3f2d0b3a41d2c06dc483668e1fc01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aeb297d20c3f2d0b3a41d2c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:42 2021 -0600 kernel32: Reimplement GetActiveProcessorCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 710dfad8b7a..acdedd979f3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -634,9 +634,32 @@ WORD WINAPI GetActiveProcessorGroupCount(void) */ DWORD WINAPI GetActiveProcessorCount(WORD group) { - DWORD cpus = system_info.NumberOfProcessors; + DWORD cpus = 0; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; - FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); + TRACE("(0x%x)\n", group); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + if (group == ALL_PROCESSOR_GROUPS) + { + for (group = 0; group < info->Group.ActiveGroupCount; group++) + cpus += info->Group.GroupInfo[group].ActiveProcessorCount; + } + else + { + if (group < info->Group.ActiveGroupCount) + cpus = info->Group.GroupInfo[group].ActiveProcessorCount; + } + + HeapFree(GetProcessHeap(), 0, info); return cpus; }

1 0

Alex Henrie : kernel32: Reimplement GetMaximumProcessorCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 04114db90bf1abc5079417cfa948a3e9ab7a413d URL: https://source.winehq.org/git/wine.git/?a=commit;h=04114db90bf1abc5079417cf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:43 2021 -0600 kernel32: Reimplement GetMaximumProcessorCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index acdedd979f3..6de094950e3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -668,9 +668,32 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) */ DWORD WINAPI GetMaximumProcessorCount(WORD group) { - DWORD cpus = system_info.NumberOfProcessors; + DWORD cpus = 0; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; - FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); + TRACE("(0x%x)\n", group); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + if (group == ALL_PROCESSOR_GROUPS) + { + for (group = 0; group < info->Group.ActiveGroupCount; group++) + cpus += info->Group.GroupInfo[group].MaximumProcessorCount; + } + else + { + if (group < info->Group.ActiveGroupCount) + cpus = info->Group.GroupInfo[group].MaximumProcessorCount; + } + + HeapFree(GetProcessHeap(), 0, info); return cpus; }

1 0

Alex Henrie : kernel32: Reimplement GetMaximumProcessorGroupCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 8ddff3f51faca2c0824e204a69f69e241fb93d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ddff3f51faca2c0824e204a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:44 2021 -0600 kernel32: Reimplement GetMaximumProcessorGroupCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6de094950e3..aa0922f5164 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -702,8 +702,24 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) */ WORD WINAPI GetMaximumProcessorGroupCount(void) { - FIXME("semi-stub, always returning 1\n"); - return 1; + WORD groups; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; + + TRACE("()\n"); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + groups = info->Group.MaximumGroupCount; + + HeapFree(GetProcessHeap(), 0, info); + return groups; } /***********************************************************************

1 0

Rémi Bernon : msvcrt: Set next_token when str is empty in wcstok_s.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 32bbef5d3e6a5b174bdc1343d2d43b161f45fa1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=32bbef5d3e6a5b174bdc1343… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 15:59:46 2021 +0200 msvcrt: Set next_token when str is empty in wcstok_s. Otherwise, when str is empty, an invalid parameter exception is raised. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 11 +++++++---- dlls/ucrtbase/tests/string.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 343dec70477..615b4f36a33 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1910,10 +1910,13 @@ wchar_t * CDECL wcstok_s( wchar_t *str, const wchar_t *delim, if (!str) str = *next_token; while (*str && wcschr( delim, *str )) str++; - if (!*str) return NULL; - ret = str++; - while (*str && !wcschr( delim, *str )) str++; - if (*str) *str++ = 0; + if (!*str) ret = NULL; + else + { + ret = str++; + while (*str && !wcschr( delim, *str )) str++; + if (*str) *str++ = 0; + } *next_token = str; return ret; } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 1a4fbbd76f0..9b1d21b801c 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -418,6 +418,24 @@ static void test_wcstok(void) ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); token = wcstok(NULL, L" ", NULL); ok(!token, "expected NULL, got %p\n", token); + + next = NULL; + wcscpy(buffer, input); + token = wcstok(buffer, L"=", &next); + ok(!wcscmp(token, input), "expected \"%ls\", got \"%ls\"\n", input, token); + ok(next == buffer + wcslen(input), "expected %p, got %p\n", buffer + wcslen(input), next); + token = wcstok(NULL, L"=", &next); + ok(!token, "expected NULL, got \"%ls\"\n", token); + ok(next == buffer + wcslen(input), "expected %p, got %p\n", buffer + wcslen(input), next); + + next = NULL; + wcscpy(buffer, L""); + token = wcstok(buffer, L"=", &next); + ok(token == NULL, "expected NULL, got \"%ls\"\n", token); + ok(next == buffer, "expected %p, got %p\n", buffer, next); + token = wcstok(NULL, L"=", &next); + ok(!token, "expected NULL, got \"%ls\"\n", token); + ok(next == buffer, "expected %p, got %p\n", buffer, next); } static void test__strnicmp(void)

1 0

Piotr Caban : msvcrt: Update search position when no token was found in strtok.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: bf7244442de0dfdc5a13f6c6a1624fbf5b762ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf7244442de0dfdc5a13f6c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 25 18:00:15 2021 +0200 msvcrt: Update search position when no token was found in strtok. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 6 +++++- dlls/msvcrt/tests/string.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d335fce4992..27e3284326a 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -287,7 +287,11 @@ char * CDECL strtok( char *str, const char *delim ) if (!(str = data->strtok_next)) return NULL; while (*str && strchr( delim, *str )) str++; - if (!*str) return NULL; + if (!*str) + { + data->strtok_next = str; + return NULL; + } ret = str++; while (*str && !strchr( delim, *str )) str++; if (*str) *str++ = 0; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6bf3b6e775d..be0356f4c7e 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1685,6 +1685,14 @@ static void test_strtok(void) "third call string (%p) \'%s\' return %p\n", teststr, testcases_strtok[i].string, strret); } + + strcpy( teststr, "test a=b" ); + strret = strtok( teststr, " " ); + ok( strret == teststr, "strret = %p, expected %p\n", strret, teststr ); + strret = strtok( NULL, "ab=" ); + ok( !strret, "strret = %p, expected NULL\n", strret ); + strret = strtok( NULL, "=" ); + ok( !strret, "strret = %p, expected NULL\n", strret ); } static void test_strtol(void)

1 0

Zebediah Figura : wined3d: Fix a spelling error in a comment.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 98f7be854065b536b48db808c9a3ede5f7748d2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=98f7be854065b536b48db808… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 25 11:01:37 2021 -0500 wined3d: Fix a spelling error in a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dcdd08ac9b1..c7a9b4da3e1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1297,7 +1297,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) { - /* Conditinal non power of two textures use a different clamping + /* Conditional non power of two textures use a different clamping * default. If we're using the GL_WINE_normalized_texrect partial * driver emulation, we're dealing with a GL_TEXTURE_2D texture which * has the address mode set to repeat - something that prevents us

1 0

Rémi Bernon : dssenh/tests: Add CryptAcquireContextA last error check.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: c5bdc2408fc0278bf893039a5010bcf8e22b9652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5bdc2408fc0278bf893039a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:10 2021 +0200 dssenh/tests: Add CryptAcquireContextA last error check. When container key doesn't exist yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 4d33fc86cd8..b72b1e3a614 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -71,6 +71,19 @@ static void test_acquire_context(void) /* test base DSS provider (PROV_DSS) */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); + if (!result) + { + todo_wine ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, CRYPT_NEWKEYSET); + } + ok(result, "CryptAcquireContextA succeeded\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "CryptReleaseContext failed.\n"); + result = CryptAcquireContextA( &hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); if(!result)

1 0

Rémi Bernon : dssenh: Return NTE_BAD_KEYSET when key cannot be opened.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: cf770571bf538f2794f56220f649b232688d1736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf770571bf538f2794f56220… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:11 2021 +0200 dssenh: Return NTE_BAD_KEYSET when key cannot be opened. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 3 ++- dlls/dssenh/tests/dssenh.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 6cfa04393fd..b03c05195cd 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -284,7 +284,8 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags { case 0: case 0 | CRYPT_MACHINE_KEYSET: - ret = read_key_container( name, flags ); + if (!(ret = read_key_container( name, flags ))) + SetLastError( NTE_BAD_KEYSET ); break; case CRYPT_NEWKEYSET: diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b72b1e3a614..f0fe4a02f97 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -75,7 +75,7 @@ static void test_acquire_context(void) result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); if (!result) { - todo_wine ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, CRYPT_NEWKEYSET); }

1 0