[PATCH v14 0/16] MR10209: kernelbase/loader.c: Include rudimentary support for multilanguage resource inclusion.
For programs that rely on language specific data for resources such as menus and text, attempt to search for and associated "mui" file. For example, if program "myapp.exe" is executed and resources are not found, and the user's language ID is "en-US", search for file "en-US/myapp.exe.mui", and if found, utilize that file for the source of resource data. -- v14: kernelbase/loader.c: Enhance multilanguage resource search This merge request has too many patches to be relayed via email. Please visit the URL below to see the contents of the merge request. https://gitlab.winehq.org/wine/wine/-/merge_requests/10209
This merge request was closed by Craig Schulstad. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209
On Sun Mar 1 09:24:41 2026 +0000, Alfred Agrell wrote:
I believe I told you to delete the merge commit Alfred,
Okay. I deleted (reverted) the commit. I deleted the branch, and rebuilt it. I reran the git config commands for my email address, and my name. I re-pushed the changes back up. But I still get the same message stating that it does not know who I am in the error logs. The process knew who I was last week. Since this is only one file, maybe I need to delete my branch/project on Gitlab and start from scratch. I guess someone is going to have to walk me through completely deleting my branch and starting over. I don't know what else to do. Regards, Craig -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_130871
On Sun Mar 1 16:53:03 2026 +0000, Craig Schulstad wrote:
Alfred, Okay. I deleted (reverted) the commit. I deleted the branch, and rebuilt it. I reran the git config commands for my email address, and my name. I re-pushed the changes back up. But I still get the same message stating that it does not know who I am in the error logs. The process knew who I was last week. Since this is only one file, maybe I need to delete my branch/project on Gitlab and start from scratch. I guess someone is going to have to walk me through completely deleting my branch and starting over. I don't know what else to do. Regards, Craig A revert is a new commit that undoes a prior one, deleting whatever the commit did to the resulting source tree.
It does not delete the actual commit. https://stackoverflow.com/questions/5189560/how-do-i-squash-my-last-n-commit... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_130872
On Sun Mar 1 17:07:07 2026 +0000, Alfred Agrell wrote:
A revert is a new commit that undoes a prior one, deleting whatever the commit did to the resulting source tree. It does not delete the actual commit. https://stackoverflow.com/questions/5189560/how-do-i-squash-my-last-n-commit... All,
Okay. I have tried squashing, dropping, deleting the loader.c file, re-adding the loader.c file, done git pull, git push, and globally configured my email and name. Nothing works! It keeps saying that it cannot identify me, even though it can send me an email indicating failure. If someone who knows how to navigate this Byzantine Gitlab site wants my code enhancement, they can have a copy of it. I am walking away from this for now as it has been nothing short of aggravation. Regards, Craig -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_130877
Craig, all you should need to do is to run `git rebase origin/master` followed by pushing, the same way you did the first time, only with the --force flag. Please, if you're having trouble with this, ask for help, and post console logs explaining the problems you're getting. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_130991
On Tue Mar 3 15:36:21 2026 +0000, Elizabeth Figura wrote:
Craig, all you should need to do is to run `git rebase origin/master` followed by pushing, the same way you did the first time, only with the --force flag. Please, if you're having trouble with this, ask for help, and post console logs explaining the problems you're getting. Elizabeth,
Okay. I just cleaned up my loader.c file, reran the commit -a command to enter my narrative, and did the git push --force:wine-mui-no-dakker command. Just to let you know, what might have happened was that the virtual machine that I use to do my coding had an issue and I had to restore it from a previous image. So I have regenerated my ssh key and I copied that key into my user profile. We can see if that gets me past the messages that the creator of the commit cannot be found. Regards, Craig -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_131116
On Tue Mar 3 15:36:21 2026 +0000, Craig Schulstad wrote:
Elizabeth, Okay. I just cleaned up my loader.c file, reran the commit -a command to enter my narrative, and did the git push --force:wine-mui-no-dakker command. Just to let you know, what might have happened was that the virtual machine that I use to do my coding had an issue and I had to restore it from a previous image. So I have regenerated my ssh key and I copied that key into my user profile. We can see if that gets me past the messages that the creator of the commit cannot be found. Regards, Craig Elizabeth,
I just got back another pipeline failure notification. It appears to be the same issue during the various builds. Here is a snippet of the message at the end. Committer identity unknown *** Please tell me who you are. Run git config --global user.email "you@example.com" git config --global user.name "Your Name" to set your account's default identity. Omit --global to set the identity only in this repository. fatal: unable to auto-detect email address (got 'gitlab@runner-y-5gx5mkd-project-5-concurrent-0.(none)') I will try those configuration commands, but I seem to have tried that before. Possibly I did not do it with the commit/push combo. Let me try that. Regards, Craig -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_131121
On Tue Mar 3 15:52:21 2026 +0000, Craig Schulstad wrote:
Elizabeth, I just got back another pipeline failure notification. It appears to be the same issue during the various builds. Here is a snippet of the message at the end. Committer identity unknown *** Please tell me who you are. Run git config --global user.email "you@example.com" git config --global user.name "Your Name" to set your account's default identity. Omit --global to set the identity only in this repository. fatal: unable to auto-detect email address (got 'gitlab@runner-y-5gx5mkd-project-5-concurrent-0.(none)') I will try those configuration commands, but I seem to have tried that before. Possibly I did not do it with the commit/push combo. Let me try that. Regards, Craig Elizabeth,
I just got the latest failure message. Same issue. Here is that snippet. Committer identity unknown *** Please tell me who you are. Run git config --global user.email "you@example.com" git config --global user.name "Your Name" to set your account's default identity. Omit --global to set the identity only in this repository. fatal: unable to auto-detect email address (got 'gitlab@runner-xje-gznxm-project-5-concurrent-0.(none)') For some reason, it cannot associate me with this commit. Looks like I need some expertise. If you could, please point me to an expert. I am definitely still a "newbie". Regards, Craig -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_131124
On Tue Mar 3 16:14:29 2026 +0000, Craig Schulstad wrote:
Elizabeth, I just got the latest failure message. Same issue. Here is that snippet. Committer identity unknown *** Please tell me who you are. Run git config --global user.email "you@example.com" git config --global user.name "Your Name" to set your account's default identity. Omit --global to set the identity only in this repository. fatal: unable to auto-detect email address (got 'gitlab@runner-xje-gznxm-project-5-concurrent-0.(none)') For some reason, it cannot associate me with this commit. Looks like I need some expertise. If you could, please point me to an expert. I am definitely still a "newbie". Regards, Craig The "committer identity unknown" message is a misleading error message that happens when there's merge commits.
Okay. I just cleaned up my loader.c file, reran the commit -a command to enter my narrative, and did the git push --force:wine-mui-no-dakker command.
What exact syntax did you use, and what did the command return? --force doesn't take an argument like that; it's just an argument. E.g. `git push --force origin <branch name>`. And did you run `git rebase origin/master` before pushing? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_131329
On Wed Mar 4 22:50:11 2026 +0000, Elizabeth Figura wrote:
The "committer identity unknown" message is a misleading error message that happens when there's merge commits.
Okay. I just cleaned up my loader.c file, reran the commit -a command to enter my narrative, and did the git push --force:wine-mui-no-dakker command. What exact syntax did you use, and what did the command return? --force doesn't take an argument like that; it's just an argument. E.g. `git push --force origin <branch name>`. And did you run `git rebase origin/master` before pushing? origin/master refers to his fork, which is as full of confusing commits as this one. https://gitlab.winehq.org/NoDakker/wine-mui-no-dakker/-/commits/master
I'd try `git rebase 739ca45017f7385340d82c9f8c35716ca6466473` instead. (Long-term, configuring an upstream remote and rebasing onto upstream/master would be better, but let's not teach Craig about remotes now. He's overwhelmed enough already.) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_131330
On Wed Mar 4 22:59:39 2026 +0000, Alfred Agrell wrote:
origin/master refers to his fork, which is as full of confusing commits as this one. https://gitlab.winehq.org/NoDakker/wine-mui-no-dakker/-/commits/master I'd try `git rebase 739ca45017f7385340d82c9f8c35716ca6466473` instead. (Long-term, configuring an upstream remote and rebasing onto upstream/master would be better, but let's not teach Craig about remotes now. He's overwhelmed enough already.) All,
Per the suggestion to squash down the commits, I did that, and I was able to successfully get the commit to do all of the successful builds. And, all of the testing was passed except the "test-linux-32" set. Previously, I had hundreds of failures in this test, but now it appears to be reduced down to two issues. The first one has to do with a "LoadStringA" test in the user32/resource.c module. user32:resource start dlls/user32/tests/resource.c resource.c:216:0.025 Test failed: GetLastError() = 126 The second issue has to do with an environment edit function in the win32u/win32u.c module. win32u:win32u start dlls/win32u/tests/win32u.c win32u.c:357:0.214 Test marked todo: NtUserGetProp returned 0 win32u.c:361:0.214 Test marked todo: NtUserGetProp returned 0 win32u.c:386:0.214 Test marked todo: NtQueryInformationAtom returned 0xc000000d win32u.c:393:0.214 Test marked todo: NtUserGetProp returned 00000000 win32u.c:396:0.214 Test marked todo: NtQueryInformationAtom returned 0xc000000d win32u.c:448:0.217 Test failed: 0xc010: L"EditEnvItems": buf = L"cc71578f-a78f-4953-89fd-43711041beee" I honestly don't know if these are issues arising from my enhancement in kernelbase/loader.c or if these are issues being caused by other commits in this set. First off, can someone tell me what error code "126" refers to, as I could follow the path of the string load function calling the resource search function which is a function I did enhance. Thanks in advance. Regards, Craig -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_131334
On Wed Mar 4 23:07:30 2026 +0000, Craig Schulstad wrote:
All, Per the suggestion to squash down the commits, I did that, and I was able to successfully get the commit to do all of the successful builds. And, all of the testing was passed except the "test-linux-32" set. Previously, I had hundreds of failures in this test, but now it appears to be reduced down to two issues. The first one has to do with a "LoadStringA" test in the user32/resource.c module. user32:resource start dlls/user32/tests/resource.c resource.c:216:0.025 Test failed: GetLastError() = 126 The second issue has to do with an environment edit function in the win32u/win32u.c module. win32u:win32u start dlls/win32u/tests/win32u.c win32u.c:357:0.214 Test marked todo: NtUserGetProp returned 0 win32u.c:361:0.214 Test marked todo: NtUserGetProp returned 0 win32u.c:386:0.214 Test marked todo: NtQueryInformationAtom returned 0xc000000d win32u.c:393:0.214 Test marked todo: NtUserGetProp returned 00000000 win32u.c:396:0.214 Test marked todo: NtQueryInformationAtom returned 0xc000000d win32u.c:448:0.217 Test failed: 0xc010: L"EditEnvItems": buf = L"cc71578f-a78f-4953-89fd-43711041beee" I honestly don't know if these are issues arising from my enhancement in kernelbase/loader.c or if these are issues being caused by other commits in this set. First off, can someone tell me what error code "126" refers to, as I could follow the path of the string load function calling the resource search function which is a function I did enhance. Thanks in advance. Regards, Craig You mean https://gitlab.winehq.org/wine/wine/-/pipelines/59189 in MR !10227? Yes, you've successfully deleted the merge commits from that one. That's progress.
126 is ERROR_MOD_NOT_FOUND, most likely from your new LoadLibraryExW call. You should GetLastError() before that call, and RestoreLastError() afterwards. I'm not sure about the win32u one. We have a bunch of tests that fail at random (yes, they're a pain), but I'm not familiar enough with that part of Wine to determine if that's one of the unstable ones, or if it's due to your changes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_131335
On Wed Mar 4 23:23:02 2026 +0000, Alfred Agrell wrote:
You mean https://gitlab.winehq.org/wine/wine/-/pipelines/59189 in MR !10227? Yes, you've successfully deleted the merge commits from that one. That's progress. 126 is ERROR_MOD_NOT_FOUND, most likely from your new LoadLibraryExW call. You should GetLastError() before that call, and RestoreLastError() afterwards. I'm not sure about the win32u one. We have a bunch of tests that fail at random (yes, they're a pain), but I'm not familiar enough with that part of Wine to determine if that's one of the unstable ones, or if it's due to your changes. Alfred,
Looking at my "get_mui" function, your statement makes sense. Thank you. I will do whatever pulls, changes to loader.c to save and restore the error code, commit, and push in the morning. Regards, Craig -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_131340
On Thu Mar 5 01:00:11 2026 +0000, Craig Schulstad wrote:
Alfred, Looking at my "get_mui" function, your statement makes sense. Thank you. I will do whatever pulls, changes to loader.c to save and restore the error code, commit, and push in the morning. Regards, Craig All,
Since there has been a release of Wine over the weekend, I figure that I need to get a fresh version of the code to use and apply mode code changes to the kernelbase/loader.c file. However, when I try to run the "git pull" command, I do not seem to connect and get a fresh copy. Following is the messages I get: craig@Sandbox:~/wine-mui-no-dakker$ git pull --rebase You are not currently on a branch. Please specify which branch you want to rebase against. See git-pull(1) for details. git pull <remote> <branch> Looks like I need some more guidance. To recap to whoever responds to this request, the enhancement I am attempting to apply is just to the "loader.c" program file for "kernelbase". I am hopeful that the latest noted refinement addresses the two test failures I incurred last week. Thanks in advance. Craig -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_131601
participants (3)
-
Alfred Agrell (＠Alcaro) -
Craig Schulstad (＠NoDakker)
-
Elizabeth Figura (＠zfigura)