From f3b03ce5a1cdedc112dac91a597365f1e21b20ef Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 4 Sep 2021 08:24:36 +1000 Subject: [PATCH] Rebase against 8b9f1e12841298591387e2b7590191610a37986e. --- ...for-sys-eventfd.h-ppoll-and-shm_open.patch | 30 +++++++++---------- .../0002-gdi32-fix-for-rotated-ellipse.patch | 22 +++++++------- ...-support-for-junction-point-creation.patch | 22 +++++++------- patches/patchinstall.sh | 2 +- staging/upstream-commit | 2 +- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch b/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch index 6fb4c2b4..f978cf85 100644 --- a/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch +++ b/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch @@ -1,4 +1,4 @@ -From f8f619802b42448514fdab786a2c593658c33625 Mon Sep 17 00:00:00 2001 +From 33486bf9924ffb152e008ec662e2f9905d67c449 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 13 Jun 2018 10:44:49 -0500 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open(). @@ -13,7 +13,7 @@ Although perhaps we shouldn't since the server doesn't do this. 3 files changed, 89 insertions(+) diff --git a/configure b/configure -index c9418c0f225..65a20ef25c8 100755 +index f2319159834..a3916efab32 100755 --- a/configure +++ b/configure @@ -7543,6 +7543,7 @@ for ac_header in \ @@ -24,15 +24,15 @@ index c9418c0f225..65a20ef25c8 100755 sys/filio.h \ sys/ioctl.h \ sys/ipc.h \ -@@ -18011,6 +18012,7 @@ for ac_func in \ +@@ -18009,6 +18010,7 @@ for ac_func in \ poll \ port_create \ posix_fadvise \ + ppoll \ prctl \ - pread \ proc_pidinfo \ -@@ -18411,6 +18413,72 @@ fi + readlink \ +@@ -18402,6 +18404,72 @@ fi ;; esac @@ -106,10 +106,10 @@ index c9418c0f225..65a20ef25c8 100755 then if ${LDAP_CFLAGS:+false} :; then : diff --git a/configure.ac b/configure.ac -index a7c3be91b7e..0845cc83554 100644 +index 73869723bd3..6cab92efd74 100644 --- a/configure.ac +++ b/configure.ac -@@ -512,6 +512,7 @@ AC_CHECK_HEADERS(\ +@@ -510,6 +510,7 @@ AC_CHECK_HEADERS(\ sys/cdio.h \ sys/epoll.h \ sys/event.h \ @@ -117,15 +117,15 @@ index a7c3be91b7e..0845cc83554 100644 sys/filio.h \ sys/ioctl.h \ sys/ipc.h \ -@@ -2216,6 +2217,7 @@ AC_CHECK_FUNCS(\ +@@ -2212,6 +2213,7 @@ AC_CHECK_FUNCS(\ poll \ port_create \ posix_fadvise \ + ppoll \ prctl \ - pread \ proc_pidinfo \ -@@ -2272,6 +2274,16 @@ case $host_os in + readlink \ +@@ -2262,6 +2264,16 @@ case $host_os in ;; esac @@ -143,10 +143,10 @@ index a7c3be91b7e..0845cc83554 100644 if test "x$with_ldap" != "xno" then diff --git a/include/config.h.in b/include/config.h.in -index 2b488894a49..1b3ab9f9580 100644 +index 9f8e7f34ada..5ecf57cde58 100644 --- a/include/config.h.in +++ b/include/config.h.in -@@ -516,6 +516,9 @@ +@@ -507,6 +507,9 @@ /* Define to 1 if you have the `posix_fadvise' function. */ #undef HAVE_POSIX_FADVISE @@ -156,7 +156,7 @@ index 2b488894a49..1b3ab9f9580 100644 /* Define to 1 if you have the `prctl' function. */ #undef HAVE_PRCTL -@@ -600,6 +603,9 @@ +@@ -585,6 +588,9 @@ /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */ #undef HAVE_SG_IO_HDR_T_INTERFACE_ID @@ -166,7 +166,7 @@ index 2b488894a49..1b3ab9f9580 100644 /* Define if sigaddset is supported */ #undef HAVE_SIGADDSET -@@ -767,6 +773,9 @@ +@@ -749,6 +755,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_EPOLL_H @@ -177,5 +177,5 @@ index 2b488894a49..1b3ab9f9580 100644 #undef HAVE_SYS_EVENT_H -- -2.32.0 +2.33.0 diff --git a/patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch b/patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch index 57796a1a..7ff99c45 100644 --- a/patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch +++ b/patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch @@ -1,4 +1,4 @@ -From 6ccddc7e2faf2dbde5f20d983e3f64e0cb8e2821 Mon Sep 17 00:00:00 2001 +From 017514cff847b53d409bf5c8735c30d26474ed8f Mon Sep 17 00:00:00 2001 From: Daniel Wendt Date: Tue, 10 Dec 2013 14:55:32 +0100 Subject: [PATCH] gdi32: fix for rotated ellipse @@ -9,10 +9,10 @@ Bug: http://bugs.winehq.org/show_bug.cgi?id=35331 1 file changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c -index 5d246eea07f..2b33233dee9 100644 +index da9144f0862..6a0519644f4 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c -@@ -1534,6 +1534,23 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott +@@ -1535,6 +1535,23 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott BOOL ret = TRUE; HRGN outline = 0, interior = 0; @@ -36,7 +36,7 @@ index 5d246eea07f..2b33233dee9 100644 if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE; pt[0].x = pt[0].y = 0; -@@ -1554,23 +1571,6 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott +@@ -1555,23 +1572,6 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott return FALSE; } @@ -45,7 +45,7 @@ index 5d246eea07f..2b33233dee9 100644 - ellipse_width, ellipse_height ))) - { - HeapFree( GetProcessHeap(), 0, points ); -- if (outline) DeleteObject( outline ); +- if (outline) NtGdiDeleteObjectApp( outline ); - return FALSE; - } - @@ -53,14 +53,14 @@ index 5d246eea07f..2b33233dee9 100644 - if (interior && !outline) - { - ret = brush_region( pdev, interior ); -- DeleteObject( interior ); +- NtGdiDeleteObjectApp( interior ); - interior = 0; - } - count = ellipse_first_quadrant( ellipse_width, ellipse_height, points ); if (dc->attr->arc_direction == AD_CLOCKWISE) -@@ -1614,13 +1614,37 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott +@@ -1615,13 +1615,37 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott } count = end + 1; @@ -77,7 +77,7 @@ index 5d246eea07f..2b33233dee9 100644 + !(interior = CreatePolygonRgn(points, count, ALTERNATE))) + { + HeapFree( GetProcessHeap(), 0, points ); -+ if (outline) DeleteObject( outline ); ++ if (outline) NtGdiDeleteObjectApp( outline ); + return FALSE; + } + @@ -85,7 +85,7 @@ index 5d246eea07f..2b33233dee9 100644 + if (interior && !outline) + { + ret = brush_region( pdev, interior ); -+ DeleteObject( interior ); ++ NtGdiDeleteObjectApp( interior ); + interior = 0; + } + @@ -97,8 +97,8 @@ index 5d246eea07f..2b33233dee9 100644 { - NtGdiCombineRgn( interior, interior, outline, RGN_DIFF ); ret = brush_region( pdev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); } -- -2.30.2 +2.33.0 diff --git a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch index 551e753f..9d36b8c5 100644 --- a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch +++ b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch @@ -1,4 +1,4 @@ -From deebd97b531b74f34fd30ab5ef699812c5be1fe1 Mon Sep 17 00:00:00 2001 +From 0d7dd662276c859955251d2cbeef0d60195d6574 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 16 Jan 2014 20:56:49 -0700 Subject: [PATCH] ntdll: Add support for junction point creation. @@ -14,12 +14,12 @@ Signed-off-by: Erich E. Hoover create mode 100644 include/ntifs.h diff --git a/configure.ac b/configure.ac -index 24bcc7448d2..f80fbd737ef 100644 +index 855f0848eec..41ab0c1d8e4 100644 --- a/configure.ac +++ b/configure.ac @@ -2215,6 +2215,8 @@ AC_CHECK_FUNCS(\ + prctl \ proc_pidinfo \ - pwrite \ readlink \ + renameat \ + renameat2 \ @@ -152,7 +152,7 @@ index 46037546e6e..7a01e947e13 100644 test_mailslot_name(); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c -index 4e18e229b1a..f6c23f629b8 100644 +index 38c03d114ed..683bd67385d 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -36,6 +36,7 @@ @@ -171,7 +171,7 @@ index 4e18e229b1a..f6c23f629b8 100644 WINE_DEFAULT_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(winediag); -@@ -153,6 +155,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); +@@ -150,6 +152,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #undef EXT2_IOC_GETFLAGS #undef EXT4_CASEFOLD_FL @@ -182,7 +182,7 @@ index 4e18e229b1a..f6c23f629b8 100644 #ifdef linux /* We want the real kernel dirent structure, not the libc one */ -@@ -477,6 +483,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si +@@ -474,6 +480,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si #endif } @@ -215,7 +215,7 @@ index 4e18e229b1a..f6c23f629b8 100644 /* get space from the current directory data buffer, allocating a new one if necessary */ static void *get_dir_data_space( struct dir_data *data, unsigned int size ) { -@@ -5942,6 +5974,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer, +@@ -5922,6 +5954,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer, } @@ -332,7 +332,7 @@ index 4e18e229b1a..f6c23f629b8 100644 /****************************************************************************** * NtFsControlFile (NTDLL.@) */ -@@ -6024,6 +6166,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap +@@ -6004,6 +6146,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap break; } @@ -357,10 +357,10 @@ index 4e18e229b1a..f6c23f629b8 100644 TRACE("FSCTL_SET_SPARSE: Ignoring request\n"); io->Information = 0; diff --git a/include/Makefile.in b/include/Makefile.in -index 9b397ffa183..ee440a07a94 100644 +index 43a4fd98a42..99cab5a18f6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -543,6 +543,7 @@ SOURCES = \ +@@ -545,6 +545,7 @@ SOURCES = \ ntdef.h \ ntdsapi.h \ ntgdi.h \ @@ -417,5 +417,5 @@ index 00000000000..21d42e17325 + +#endif /* __WINE_NTIFS_H */ -- -2.30.2 +2.33.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index fe64695f..2e5d2f65 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "21c4a25437969696cbf5ffecee191ba8302bb2dd" + echo "8b9f1e12841298591387e2b7590191610a37986e" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index a4e9aa2e..a84f7cb4 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -21c4a25437969696cbf5ffecee191ba8302bb2dd +8b9f1e12841298591387e2b7590191610a37986e