Skip to content

Commit

Permalink
esync-mainline: rebase against wine 10.0-rc1 (#1342)
Browse files Browse the repository at this point in the history
Signed-off-by: Kirill Artemev <[email protected]>
  • Loading branch information
Artewar67 authored Dec 16, 2024
1 parent e9125cb commit 62ce136
Show file tree
Hide file tree
Showing 3 changed files with 4,777 additions and 3 deletions.
4 changes: 3 additions & 1 deletion wine-tkg-git/wine-tkg-patches/proton/esync/esync
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

# esync
if [ "$_use_esync" = "true" ]; then
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 962017beef4a0405e4fece0075e286e445da55da HEAD ); then
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 4161e62e478f61fdcd0365d9bd7b21e3b1a5197b HEAD ); then
_patchname='esync-unix-mainline.patch' && _patchmsg="Using Esync (unix, mainline) patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 962017beef4a0405e4fece0075e286e445da55da HEAD ); then
_patchname='esync-unix-mainline-4161e62e.patch' && _patchmsg="Using Esync (unix, mainline) patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor e01b70851fae74c9a4067e00f4c48f17f319ed2d HEAD ); then
_patchname='esync-unix-mainline-962017be.patch' && _patchmsg="Using Esync (unix, mainline) patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor cebad42f35c3360ee73c0ff63baa546cd1bf35aa HEAD ); then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4129,9 +4129,9 @@ index 56092e5b1ac..eec69ddbcaf 100644
--- a/server/process.h
+++ b/server/process.h
@@ -98,6 +98,7 @@ struct process
const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */
struct list rawinput_entry; /* entry in the rawinput process list */
struct list kernel_object; /* list of kernel object pointers */
pe_image_info_t image_info; /* main exe image info */
struct pe_image_info image_info; /* main exe image info */
+ int esync_fd; /* esync file descriptor (signaled on exit) */
};

Expand Down
Loading

0 comments on commit 62ce136

Please sign in to comment.