Compare commits
34 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
623fdfe7ed | ||
|
|
db082f083a | ||
|
|
b44dc29930 | ||
|
|
af6c1782a2 | ||
|
|
e8364c165f | ||
|
|
e6559db2a3 | ||
|
|
93da4dc922 | ||
|
|
a64cc2643d | ||
|
|
ac54b336e3 | ||
|
|
f30e696159 | ||
|
|
64e0d3f26e | ||
|
|
cb3a9e84ce | ||
|
|
1a90d98aba | ||
|
|
533469bd7f | ||
|
|
fde00fdab1 | ||
|
|
39b67234f3 | ||
|
|
f829700928 | ||
|
|
cd9d5f0876 | ||
|
|
66c41f94e5 | ||
|
|
7383a6f78f | ||
|
|
d4a8da5c37 | ||
|
d82bea6dc8 |
|||
|
02a6e3f7e2 |
|||
|
a8574c637a |
|||
|
68367aba7b |
|||
|
|
721169b2f0 | ||
|
|
7d44cb18f7 | ||
|
|
1ee4875723 | ||
|
|
3dbc55d5a9 | ||
|
|
65a088941c | ||
|
|
d634485766 | ||
|
|
428f5cdcd6 | ||
|
|
0701a14791 | ||
|
093e8c9872 |
5 changed files with 1169 additions and 1085 deletions
6
sources
6
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (wine-10.4.tar.xz) = e1f2bf5bd021fe9937cb27e1ee3ce0e5ff06a32abe3d1e07eb6083f5dcdfcd84e5b4d631dd1a83686dd7a42a1b84eec848ec08a256c2570a709d830ce7f7208a
|
||||
SHA512 (wine-10.4.tar.xz.sign) = d1900b616ab50f8df02d6fd756f2fb0d74a11f8e53657673c012272a16bdd865e2f05eb58aa6faeb3ca6d4ff3684a133f965d3b316bfd293ec0659c1c6218051
|
||||
SHA512 (wine-staging-10.4.tar.gz) = 3b0580baeb5dd7a5a224a2977fd6693795d7a86d7692b1707eba8bc9f849057a88566aa45bacbb5ded609ede3b0196c68116b368a527d695cafda1ac4ebef3cf
|
||||
SHA512 (wine-11.0.tar.xz) = a2c3db14f8cf0d19927466805c8f17c68ee7e93d1196d1162dd2279af497c21ec611a63f7a9de59953bbdfdb44c87d7bf55373c6533224a5d54e434c29428d1b
|
||||
SHA512 (wine-11.0.tar.xz.sign) = b37064b787e4cff05b01f0d04fe2af8ff341e274a41a0238b5e58e392223bcd3574eb593f78ba7de8fb8caea7c27abf2a1259527807a2bec2413aa9ce027e183
|
||||
SHA512 (wine-staging-11.0.tar.gz) = 27eecce0cc1974e97d2aaffc0bf5a5d114f5fd8d3d6a349d9f984058a316b6654dd07bc2223c38df16fd2862f59aa79518d2d109ea0ac41c957144377ddd39a7
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
--- wine-7.20.old/aclocal.m4 2022-11-17 17:19:01.772386752 +0100
|
||||
+++ wine-7.20/aclocal.m4 2022-11-17 17:24:03.721683055 +0100
|
||||
@@ -279,15 +279,17 @@
|
||||
dnl
|
||||
dnl Usage: WINE_CHECK_DEFINE(name),[action-if-yes,[action-if-no]])
|
||||
dnl
|
||||
AC_DEFUN([WINE_CHECK_DEFINE],
|
||||
[AS_VAR_PUSHDEF([ac_var],[ac_cv_cpp_def_$1])dnl
|
||||
-AC_CACHE_CHECK([whether we need to define $1],ac_var,
|
||||
- AC_EGREP_CPP(yes,[#ifndef $1
|
||||
-yes
|
||||
-#endif],
|
||||
- [AS_VAR_SET(ac_var,yes)],[AS_VAR_SET(ac_var,no)]))
|
||||
+AC_CACHE_CHECK([whether we need to define $1], ac_var,
|
||||
+ [AC_PREPROC_IFELSE([[
|
||||
+#ifndef $1
|
||||
+#error not defined
|
||||
+#endif
|
||||
+]],
|
||||
+ [AS_VAR_SET(ac_var,no)],[AS_VAR_SET(ac_var,yes)])])
|
||||
AS_VAR_IF([ac_var],[yes],
|
||||
[CFLAGS="$CFLAGS -D$1"
|
||||
LINTFLAGS="$LINTFLAGS -D$1"])dnl
|
||||
AS_VAR_POPDEF([ac_var])])
|
||||
|
||||
1
wine-ntsync.conf
Normal file
1
wine-ntsync.conf
Normal file
|
|
@ -0,0 +1 @@
|
|||
ntsync
|
||||
|
|
@ -1,143 +0,0 @@
|
|||
From cd2cce28ccd2791d0a7ab02bb02b804551ee4095 Mon Sep 17 00:00:00 2001
|
||||
From: Elizabeth Figura <zfigura@codeweavers.com>
|
||||
Date: Mon, 12 Aug 2024 16:55:29 -0500
|
||||
Subject: [PATCH] eventfd_synchronization: Fix compile warnings.
|
||||
|
||||
Why, GCC, did you think this was a good idea?
|
||||
---
|
||||
...tdll-Compile-warning-fixes-for-esync.patch | 126 ++++++++++++++++++
|
||||
1 file changed, 126 insertions(+)
|
||||
create mode 100644 patches/eventfd_synchronization/0057-ntdll-Compile-warning-fixes-for-esync.patch
|
||||
|
||||
diff --git a/patches/eventfd_synchronization/0057-ntdll-Compile-warning-fixes-for-esync.patch b/patches/eventfd_synchronization/0057-ntdll-Compile-warning-fixes-for-esync.patch
|
||||
new file mode 100644
|
||||
index 000000000..f80cdd93b
|
||||
--- /dev/null
|
||||
+++ b/patches/eventfd_synchronization/0057-ntdll-Compile-warning-fixes-for-esync.patch
|
||||
@@ -0,0 +1,126 @@
|
||||
+From fed04f8ef69b829fa2cf3c7051160a6f822912dd Mon Sep 17 00:00:00 2001
|
||||
+From: Elizabeth Figura <zfigura@codeweavers.com>
|
||||
+Date: Mon, 12 Aug 2024 16:54:44 -0500
|
||||
+Subject: [PATCH] ntdll: Compile warning fixes for esync.
|
||||
+
|
||||
+---
|
||||
+ dlls/ntdll/unix/esync.c | 26 +++++++++++++-------------
|
||||
+ dlls/ntdll/unix/esync.h | 4 ++--
|
||||
+ 2 files changed, 15 insertions(+), 15 deletions(-)
|
||||
+
|
||||
+diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
|
||||
+index f4748e405ef..86809b610c7 100644
|
||||
+--- a/dlls/ntdll/unix/esync.c
|
||||
++++ b/dlls/ntdll/unix/esync.c
|
||||
+@@ -73,29 +73,29 @@ int do_esync(void)
|
||||
+
|
||||
+ struct esync
|
||||
+ {
|
||||
+- enum esync_type type;
|
||||
++ LONG type;
|
||||
+ int fd;
|
||||
+ void *shm;
|
||||
+ };
|
||||
+
|
||||
+ struct semaphore
|
||||
+ {
|
||||
+- int max;
|
||||
+- int count;
|
||||
++ LONG max;
|
||||
++ LONG count;
|
||||
+ };
|
||||
+ C_ASSERT(sizeof(struct semaphore) == 8);
|
||||
+
|
||||
+ struct mutex
|
||||
+ {
|
||||
+- DWORD tid;
|
||||
+- int count; /* recursion count */
|
||||
++ LONG tid;
|
||||
++ LONG count; /* recursion count */
|
||||
+ };
|
||||
+ C_ASSERT(sizeof(struct mutex) == 8);
|
||||
+
|
||||
+ struct event
|
||||
+ {
|
||||
+- int signaled;
|
||||
+- int locked;
|
||||
++ LONG signaled;
|
||||
++ LONG locked;
|
||||
+ };
|
||||
+ C_ASSERT(sizeof(struct event) == 8);
|
||||
+
|
||||
+@@ -182,7 +182,7 @@ static struct esync *add_to_list( HANDLE handle, enum esync_type type, int fd, v
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+- if (!InterlockedCompareExchange( (int *)&esync_list[entry][idx].type, type, 0 ))
|
||||
++ if (!InterlockedCompareExchange( &esync_list[entry][idx].type, type, 0 ))
|
||||
+ {
|
||||
+ esync_list[entry][idx].fd = fd;
|
||||
+ esync_list[entry][idx].shm = shm;
|
||||
+@@ -206,7 +206,7 @@ static struct esync *get_cached_object( HANDLE handle )
|
||||
+ * message queue, etc.) */
|
||||
+ static NTSTATUS get_object( HANDLE handle, struct esync **obj )
|
||||
+ {
|
||||
+- NTSTATUS ret = STATUS_SUCCESS;
|
||||
++ int ret = STATUS_SUCCESS;
|
||||
+ enum esync_type type = 0;
|
||||
+ unsigned int shm_idx = 0;
|
||||
+ obj_handle_t fd_handle;
|
||||
+@@ -274,7 +274,7 @@ NTSTATUS esync_close( HANDLE handle )
|
||||
+
|
||||
+ if (entry < ESYNC_LIST_ENTRIES && esync_list[entry])
|
||||
+ {
|
||||
+- if (InterlockedExchange((int *)&esync_list[entry][idx].type, 0))
|
||||
++ if (InterlockedExchange(&esync_list[entry][idx].type, 0))
|
||||
+ {
|
||||
+ close( esync_list[entry][idx].fd );
|
||||
+ return STATUS_SUCCESS;
|
||||
+@@ -370,7 +370,7 @@ static NTSTATUS open_esync( enum esync_type type, HANDLE *handle,
|
||||
+ }
|
||||
+
|
||||
+ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
|
||||
+- const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max)
|
||||
++ const OBJECT_ATTRIBUTES *attr, int initial, int max)
|
||||
+ {
|
||||
+ TRACE("name %s, initial %d, max %d.\n",
|
||||
+ attr ? debugstr_us(attr->ObjectName) : "<no name>", initial, max);
|
||||
+@@ -386,7 +386,7 @@ NTSTATUS esync_open_semaphore( HANDLE *handle, ACCESS_MASK access,
|
||||
+ return open_esync( ESYNC_SEMAPHORE, handle, access, attr );
|
||||
+ }
|
||||
+
|
||||
+-NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
|
||||
++NTSTATUS esync_release_semaphore( HANDLE handle, unsigned int count, ULONG *prev )
|
||||
+ {
|
||||
+ struct esync *obj;
|
||||
+ struct semaphore *semaphore;
|
||||
+@@ -800,7 +800,7 @@ static BOOL update_grabbed_object( struct esync *obj )
|
||||
+
|
||||
+ /* A value of STATUS_NOT_IMPLEMENTED returned from this function means that we
|
||||
+ * need to delegate to server_select(). */
|
||||
+-static NTSTATUS __esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
|
||||
++static NTSTATUS __esync_wait_objects( unsigned int count, const HANDLE *handles, BOOLEAN wait_any,
|
||||
+ BOOLEAN alertable, const LARGE_INTEGER *timeout )
|
||||
+ {
|
||||
+ static const LARGE_INTEGER zero;
|
||||
+diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
|
||||
+index 59f8809fc1a..9102cf911aa 100644
|
||||
+--- a/dlls/ntdll/unix/esync.h
|
||||
++++ b/dlls/ntdll/unix/esync.h
|
||||
+@@ -23,11 +23,11 @@ extern void esync_init(void);
|
||||
+ extern NTSTATUS esync_close( HANDLE handle );
|
||||
+
|
||||
+ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
|
||||
+- const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max);
|
||||
++ const OBJECT_ATTRIBUTES *attr, int initial, int max);
|
||||
+ extern NTSTATUS esync_open_semaphore( HANDLE *handle, ACCESS_MASK access,
|
||||
+ const OBJECT_ATTRIBUTES *attr );
|
||||
+ extern NTSTATUS esync_query_semaphore( HANDLE handle, void *info, ULONG *ret_len );
|
||||
+-extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev );
|
||||
++extern NTSTATUS esync_release_semaphore( HANDLE handle, unsigned int count, ULONG *prev );
|
||||
+
|
||||
+ extern NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
|
||||
+ const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN initial );
|
||||
+--
|
||||
+2.45.2
|
||||
+
|
||||
Loading…
Add table
Add a link
Reference in a new issue