[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
participants (3)
-
Alfred Agrell (＠Alcaro) -
Craig Schulstad (＠NoDakker)
-
Elizabeth Figura (＠zfigura)