On Tue Aug 13 14:32:40 2024 +0000, Kevin Martinez wrote:
The hunks in 3/3 need to be fixed up to 1/3 or 2/3 as appropriate.
Sorry but I don't know what that means. You mean like fix the code down to 2 or 1 commit?
what version of Windows are you seeing vend this class from shell32?
To be honest, I didn't personally check what library provided this class, I just followed some hints, especially [from this bug](https://bugs.winehq.org/show_bug.cgi?id=53620).
hunk = part of a git commit. In this case, the changes to enumobjects.c should be moved from commit 3 to commit 2, and then the changes to enum_objects_Next/Skip/Reset should be moved to commit 1.
This won't change the final state of the git tree, but [the Wine project values](https://wiki.winehq.org/Submitting_Patches#Managing_your_submission) each commit being clean and not introducing style issues that get fixed in next commit.
There are many ways to shuffle around commits, but one method is [splitting the commits](https://stackoverflow.com/questions/6217156/break-a-previous-commit-into-mul...), then git rebase -i to merge and move the pieces where they belong (swap lines, and change pick to fixup).