search

Frogging-Family / community-patches

A place to find patches that are maintained by the community before myself
100 stars 38 forks source link

kernel32-implement-Windows-NT-style-GMEM_MOVEABLE-LM-no-staging.mypatch failing on Wine 7.6 #110

Open malonn23 opened 2 years ago

malonn23 commented 2 years ago

kernel32-implement-Windows-NT-style-GMEM_MOVEABLE-LM-no-staging.mypatch is failing to apply on Wine 7.6 (mainline, obviously). Here's the prepare.log contents:

Applying your own patch kernel32-implement-Windows-NT-style-GMEM_MOVEABLE-LM-no-staging.mypatch
patching file dlls/kernel32/heap.c
Hunk #1 FAILED at 156.
Hunk #2 FAILED at 238.
Hunk #3 FAILED at 252.
Hunk #4 FAILED at 321.
Hunk #5 FAILED at 333.
Hunk #6 FAILED at 344.
Hunk #7 FAILED at 419.
Hunk #8 FAILED at 429.
8 out of 8 hunks FAILED -- saving rejects to file dlls/kernel32/heap.c.rej
patching file dlls/kernel32/tests/heap.c
Hunk #1 FAILED at 334.
1 out of 1 hunk FAILED -- saving rejects to file dlls/kernel32/tests/heap.c.rej
patching file dlls/kernelbase/kernelbase.spec
Hunk #1 succeeded at 1807 (offset 37 lines).
patching file dlls/kernelbase/memory.c
Hunk #1 FAILED at 521.
Hunk #2 FAILED at 611.
Hunk #3 FAILED at 655.
Hunk #4 FAILED at 790.
Hunk #5 FAILED at 816.
5 out of 5 hunks FAILED -- saving rejects to file dlls/kernelbase/memory.c.rej
patching file include/winbase.h
Hunk #1 succeeded at 2930 with fuzz 2 (offset 20 lines).
llde commented 2 years ago

If you don't use LFH use this 0001-Allow-RtlSizeHeap-to-check-pointers-from-GlobalLock-.mypatch

I'm thinking to deprecate this patchset, and make the other patch workable for LFH too. Too many issues (as broken dotnet installation) BTW WB 310 doesn't require this anymore

Also they moved around A LOT of code.

malonn23 commented 2 years ago

Thanks for sharing your know-how. I don't know what LFH is, TBH. Also, if that's the patch I think, it only applies on staging and I run a mix of staging and mainline for my prefixes. I run staging for games, and mainline for applications (for the most part). But, I was trying to build this for a Bash prefix (yes, I'm "that guy" with 3 prefixes for one game). Being I have the latest dev build of Bash, I guess I don't need those patches any more. I never even tried to drag and drop without the patch.