[Bug 48410] New: The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

Bug ID: 48410
           Summary: The "Add syscall thunks for 64 bit" patch partly
                    breaks USVFS
           Product: Wine-staging
           Version: 5.0-rc3
          Hardware: x86
                OS: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: -unknown
          Assignee: [e-mail]
          Reporter: [e-mail]
                CC: [e-mail], [e-mail]
      Distribution: ---

This is the patch that breaks USVFS:
https://github.com/wine-staging/wine-staging/blob/d36d63ac848dadbc2c8ffc933f...
(discussion: https://github.com/ModOrganizer2/modorganizer/issues/372). I've
only tested 64-bit, so it's possible
https://github.com/wine-staging/wine-staging/blob/master/patches/winebuild-F...
also affects it.

Although USVFS works for the most part, loading DLLs fails, because LdrLoadDll
(within ntdll) calls NtOpenFile (through open_dll_file), but for some reason,
USVFS doesn't recognize that specific NtOpenFile call (even though it hooks
other NtOpenFile calls that aren't called from ntdll without issue).

I haven't looked through the patch in much detail, but from what I can tell I
believe the reason why this patch breaks USVFS is because the calls to
NtOpenFile from within ntdll use the direct function address, whereas with the
patch, USVFS now hooks a new "wrapper" around the function, instead of the same
address that ntdll calls internally.

[Bug 48410] The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

[Bug 48410] The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

--- Comment #1 from Paul Gofman  ---
Created attachment 66184
  --> https://bugs.winehq.org/attachment.cgi?id=66184
Test patch

Does the attached patch (on top of Wine Staging with all patches applied) help?

[Bug 48410] The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

Jarrard Lo  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |overlord.jarrard@tutamail.c
                   |                            |om

--- Comment #2 from Jarrard Lo  ---
(In reply to Paul Gofman from comment #1)
> Created attachment 66184 [details]
> Test patch
>
> Does the attached patch (on top of Wine Staging with all patches applied)
> help?

I'll give this patch a go if I can on top of proton-tkg (easiest to build for
me).

[Bug 48410] The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
           Keywords|                            |patch

[Bug 48410] The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

--- Comment #3 from Jarrard Lo  ---
(In reply to Jarrard Lo from comment #2)
> (In reply to Paul Gofman from comment #1)
> > Created attachment 66184 [details]
> > Test patch
> >
> > Does the attached patch (on top of Wine Staging with all patches applied)
> > help?
>
> I'll give this patch a go if I can on top of proton-tkg (easiest to build
> for me).

Ok well tested it with proton-tkg staging build 5.0rc4 and it does appear to
work. I know the patch was applied because tkg will actually prompt to apply
it, and it passed without errors (too me a little while to figure out where it
wanted the patch tho).

I guess I should at some point compile a NON patched proton-tkg staging build
to verify its working BECAUSE of this patch and not due to something else being
touched by 5.0rc4/tkg.

[Bug 48410] The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

--- Comment #4 from Paul Gofman  ---
This should be fixed in Staging 5.0-rc6.

[Bug 48410] The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

--- Comment #5 from Jarrard Lo  ---
(In reply to Paul Gofman from comment #4)
> This should be fixed in Staging 5.0-rc6.

very nice

[Bug 48410] The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

Gijs Vermeulen  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
      Fixed by SHA1|                            |68bfc31be4f2017345c2fa7f561
                   |                            |d732250192cc7
             Status|UNCONFIRMED                 |RESOLVED

--- Comment #6 from Gijs Vermeulen  ---
Marking FIXED based on Comment 4.

Please reopen if you can still reproduce.

[Bug 48410] The "Add syscall thunks for 64 bit" patch partly breaks USVFS

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=48410

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #7 from Alistair Leslie-Hughes  ---
Closing bugs fixed in Staging 5.15.