[PATCH v2 0/1] MR3660: secur32: Increment iteration index after load_package error
Otherwise if a package fail to load the routine is stuck in a continuos loop trying to load the package, resulting in a loader deadlock. This was manifested as a regression when starting visual studio 2019, trying to load the SSO lsa package, that was failing because no SSO.dll was present (or loadable) Restore the behaviour before commit 021547cabcb811c38060a2f7e675c25d26f16d3d (Pull Request !3472) Signed-Off-By: Lorenzo Ferrillo <lorenzofersteam(a)live.it> -- v2: secur32: Increment iteration index after load_package error https://gitlab.winehq.org/wine/wine/-/merge_requests/3660
From: llde <lorenzofersteam(a)live.it> Otherwise if a package fail to load the routine is stuck in a continuos loop trying to load the package, resulting in a loader deadlock Restore the behaviour before commit 021547cabcb811c38060a2f7e675c25d26f16d3d Signed-Off-By: Lorenzo Ferrillo <lorenzofersteam(a)live.it> --- dlls/secur32/lsa.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index a9ca8b60283..78dfcc1ecd2 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -967,10 +967,9 @@ void load_auth_packages(void) if (err != ERROR_SUCCESS) continue; - if (!load_package(name, &package, i + 1)) - continue; - - add_package(&package); + if (load_package(name, &package, i + 1)) + add_package(&package); + i++; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3660
On Sat Aug 26 12:11:19 2023 +0000, **** wrote:
Dmitry Timoshkov replied on the mailing list: ``` llde <wine(a)gitlab.winehq.org> wrote:
From: llde <lorenzofersteam(a)live.it> Please use your full name when submitting patches. diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index a9ca8b60283..0f9b8dceb39 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -967,11 +967,10 @@ void load_auth_packages(void) if (err != ERROR_SUCCESS) continue;
- if (!load_package(name, &package, i + 1)) + if (!load_package(name, &package, ++i)) continue;
add_package(&package); - i++; } Thanks for spotting this. Although I'd personally prefer it to look like if (load_package(name, &package, i + 1)) add_package(&package); -- Dmitry.
I do prefer this style, with the affirmative if, too. See if the new version it's of your liking @dmitry
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3660#note_43498
On Sat Aug 26 12:17:49 2023 +0000, Lorenzo Ferrillo wrote:
I do prefer this style, with the affirmative if, too. See if the new version it's of your liking @dmitry Also the commit and the name that appear on gitlab is my full name, I'm not sure why in the mailing list it appears the user handle
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3660#note_43500
Also the commit and the name that appear on gitlab is my full name, I'm not sure why in the mailing list it appears the user handle
It's possible the commit itself has only your email in it. You won't see the problem on GitLab, because it's smart enough to map that to your user profile. Try looking at your local topic branch with `git log`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3660#note_43505
participants (3)
-
Chip Davis (＠cdavis5e) -
llde
-
Lorenzo Ferrillo (＠llde)