fsync: rebase for cebad42 (#1301)

* fsync: rebase for cebad42 Signed-off-by: Kirill Artemev <artewar6767@gmail.com> * remove string --------- Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
Frogging-Family · Oct 28, 2024 · e70f71b · e70f71b
1 parent 34e383d
commit e70f71b
Show file tree

Hide file tree

Showing 5 changed files with 7,562 additions and 2 deletions.
diff --git a/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync b/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync
@@ -4,8 +4,10 @@
 	  # fsync-unix - requares 5.20+ Wine version
 	  if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 0c249e6125fc9dc6ee86b4ef6ae0d9fa2fc6291b HEAD ); then
 	    if [ "$_staging_esync" = "true" ]; then
-	      if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 7f53ca70bad150af094e77f7dde582dc3f50ff34 HEAD ); then
+	      if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor cebad42f35c3360ee73c0ff63baa546cd1bf35aa HEAD ); then
 	        _patchname='fsync-unix-staging.patch' && _patchmsg="Applied fsync patches (unix, staging)" && nonuser_patcher
+	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 7f53ca70bad150af094e77f7dde582dc3f50ff34 HEAD ); then
+	        _patchname='fsync-unix-staging-cebad42.patch' && _patchmsg="Applied fsync patches (unix, staging)" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor fd3de9005ef504a810aeb828c5b491a7bebd7888 HEAD ); then
 	        _patchname='fsync-unix-staging-7f53ca7.patch' && _patchmsg="Applied fsync patches (unix, staging)" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 37e7038c5c314527dc242cdbe5e8a70000fdfe98 HEAD ); then
@@ -55,8 +57,10 @@
 	        fi
 	      fi
 	    elif [ "$_use_esync" = "true" ]; then
-	      if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor c14de4c85e79563f5e859765d0015892ae925cd6 HEAD ); then
+	      if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor cebad42f35c3360ee73c0ff63baa546cd1bf35aa HEAD ); then
 	        _patchname='fsync-unix-mainline.patch' && _patchmsg="Applied fsync patches (unix, mainline)" && nonuser_patcher
+	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor c14de4c85e79563f5e859765d0015892ae925cd6 HEAD ); then
+	        _patchname='fsync-unix-mainline-cebad42.patch' && _patchmsg="Applied fsync patches (unix, mainline)" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor d5f23441ad460844f552d301680e061dd1a5e90a HEAD ); then
 	        _patchname='fsync-unix-mainline-c14de4c.patch' && _patchmsg="Applied fsync patches (unix, mainline)" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor af4378d46dbb72e682017485212442bf865c2226 HEAD ); then

diff --git a/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync-unix-mainline.patch b/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync-unix-mainline.patch
@@ -1722,6 +1722,14 @@ diff --git a/server/completion.c b/server/completion.c
 index ef66260c991..2149d0bbf32 100644
 --- a/server/completion.c
 +++ b/server/completion.c
+@@ -92,6 +92,7 @@ static const struct object_ops completion_wait_ops =
+     remove_queue,                   /* remove_queue */
+     completion_wait_signaled,       /* signaled */
+     NULL,                           /* get_esync_fd */
++    NULL,                           /* get_fsync_idx */
+     completion_wait_satisfied,      /* satisfied */
+     no_signal,                      /* signal */
+     no_get_fd,                      /* get_fd */
 @@ -65,6 +65,7 @@ static const struct object_ops completion_ops =
      remove_queue,              /* remove_queue */
      completion_signaled,       /* signaled */
@@ -3714,3 +3722,23 @@ index 39d969f061d..d468782667a 100644
      if (!(current = __atomic_exchange_n( &event->signaled, 1, __ATOMIC_SEQ_CST )))
          futex_wake( &event->signaled, INT_MAX );
 
+diff --git a/server/object.c b/server/object.c
+index 29f1ea9..33fc18c 100644
+--- a/server/object.c
++++ b/server/object.c
+@@ -120,6 +120,7 @@ static const struct object_ops apc_reserve_ops =
+     NULL,                       /* remove_queue */
+     NULL,                       /* signaled */
+     NULL,                       /* get_esync_fd */
++    NULL,                       /* get_fsync_idx */
+     no_satisfied,               /* satisfied */
+     no_signal,                  /* signal */
+     no_get_fd,                  /* get_fd */
+@@ -144,6 +145,7 @@ static const struct object_ops completion_reserve_ops =
+     NULL,                      /* remove_queue */
+     NULL,                      /* signaled */
+     NULL,                      /* get_esync_fd */
++    NULL,                      /* get_fsync_idx */
+     no_satisfied,              /* satisfied */
+     no_signal,                 /* signal */
+     no_get_fd,                 /* get_fd */
diff --git a/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync-unix-staging.patch b/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync-unix-staging.patch
@@ -1722,6 +1722,14 @@ diff --git a/server/completion.c b/server/completion.c
 index ef66260c991..2149d0bbf32 100644
 --- a/server/completion.c
 +++ b/server/completion.c
+@@ -92,6 +92,7 @@ static const struct object_ops completion_wait_ops =
+     remove_queue,                   /* remove_queue */
+     completion_wait_signaled,       /* signaled */
+     NULL,                           /* get_esync_fd */
++    NULL,                           /* get_fsync_idx */
+     completion_wait_satisfied,      /* satisfied */
+     no_signal,                      /* signal */
+     no_get_fd,                      /* get_fd */
 @@ -65,6 +65,7 @@ static const struct object_ops completion_ops =
      remove_queue,              /* remove_queue */
      completion_signaled,       /* signaled */
@@ -3780,4 +3788,25 @@ index 012795e410d..ba442324276 100644
      if (do_esync() && !is_signaled( queue ))
          esync_clear( queue->esync_fd );
 
+ };
+diff --git a/server/object.c b/server/object.c
+index 29f1ea9..33fc18c 100644
+--- a/server/object.c
++++ b/server/object.c
+@@ -120,6 +120,7 @@ static const struct object_ops apc_reserve_ops =
+     NULL,                       /* remove_queue */
+     NULL,                       /* signaled */
+     NULL,                       /* get_esync_fd */
++    NULL,                       /* get_fsync_idx */
+     no_satisfied,               /* satisfied */
+     no_signal,                  /* signal */
+     no_get_fd,                  /* get_fd */
+@@ -144,6 +145,7 @@ static const struct object_ops completion_reserve_ops =
+     NULL,                      /* remove_queue */
+     NULL,                      /* signaled */
+     NULL,                      /* get_esync_fd */
++    NULL,                      /* get_fsync_idx */
+     no_satisfied,              /* satisfied */
+     no_signal,                 /* signal */
+     no_get_fd,                 /* get_fd */