Rebase against dedbd1883611b1c72abeb05d9f93cd5ac8af2e90.

2024-09-13 09:17:20 -07:00 · 2015-06-16 22:35:05 +02:00 · 2015-06-16 22:35:05 +02:00 · 0bef3b01c4
commit 0bef3b01c4
parent 50b37c2d7e
6 changed files with 55 additions and 186 deletions
--- a/README.md
+++ b/README.md
@ -225,7 +225,7 @@ for more details.*
 * Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699))
 * Process APC calls before starting process
 * Process Hacker 2.x needs ntoskrnl.ProbeForRead ([Wine Bug #38103](https://bugs.winehq.org/show_bug.cgi?id=38103))
-* Properly check existence of libunwind before linking against it ([Wine Bug #38713](https://bugs.winehq.org/show_bug.cgi?id=38713))
+* ~~Properly check existence of libunwind before linking against it~~ ([Wine Bug #38713](https://bugs.winehq.org/show_bug.cgi?id=38713))
 * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
 * Return an error when trying to open a terminated process ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
 * Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](https://bugs.winehq.org/show_bug.cgi?id=23174))
--- a/debian/changelog
+++ b/debian/changelog
@ -11,6 +11,7 @@ wine-staging (1.7.46) UNRELEASED; urgency=low
    (accepted upstream).
  * Removed patch to use random names when caching very long urls in wininet
    (accepted upstream).
+  * Removed patch to fix linking against libunwind on Linux (fixed upstream).
 -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 14 Jun 2015 09:15:50 +0200

 wine-staging (1.7.45) unstable; urgency=low
--- a/patches/configure-libunwind/0001-configure-Add-libunwind-configure-flag.patch
+++ b/patches/configure-libunwind/0001-configure-Add-libunwind-configure-flag.patch
@ -1,112 +0,0 @@
-From b016d38d184be47fd5ba396925f3f1f1c4514bd2 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 12 Jun 2015 15:52:40 -0600
-Subject: configure: Add libunwind configure flag.
-
-Based on a patch by Erich E. Hoover and Ken Thomases.
---
- configure.ac               | 28 ++++++++++++++++++++++++++++
- dlls/ntdll/Makefile.in     |  2 +-
- dlls/ntdll/signal_x86_64.c |  8 ++++----
- 3 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index df28b27..78e5558 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -75,4 +75,6 @@ AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthrea
- AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
- AC_ARG_WITH(tiff,      AS_HELP_STRING([--without-tiff],[do not use TIFF]))
-+AC_ARG_WITH(unwind,    AS_HELP_STRING([--without-unwind],[do not use libunwind]),
-+            [if test "x$withval" = "xno"; then ac_cv_header_libunwind_h=no; fi])
- AC_ARG_WITH(v4l,       AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
- AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
-@@ -1084,6 +1086,32 @@ WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$PTHREA
- [pthread ${notice_platform}development files not found.
- Wine cannot support threads without libpthread.])
- 
-+dnl **** Check for libunwind ****
-+
-+if test "x$enable_win64" = "xyes"
-+then
-+    if test "$ac_cv_header_libunwind_h" = "yes"
-+    then
-+        ac_save_LIBS="$LIBS"
-+        AC_MSG_CHECKING([for libunwind])
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY
-+            #include <libunwind.h>]], [[unw_context_t u; unw_cursor_t c; unw_getcontext(&u); unw_init_local(&c, &u);]])],
-+            [AC_MSG_RESULT([yes, without linking])
-+             AC_DEFINE(HAVE_LIBUNWIND, 1, [Define to 1 if you have libunwind])],
-+            [LIBS="$LIBS -lunwind"
-+             AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY
-+                 #include <libunwind.h>]], [[unw_context_t u; unw_cursor_t c; unw_getcontext(&u); unw_init_local(&c, &u);]])],
-+                 [AC_MSG_RESULT([yes, with linking])
-+                  AC_SUBST(UNWIND_LIBS,"-lunwind")
-+                  AC_DEFINE(HAVE_LIBUNWIND, 1, [Define to 1 if you have libunwind])],
-+                 [AC_MSG_RESULT([no])
-+                  ac_cv_header_libunwind_h=no])])
-+        LIBS="$ac_save_LIBS"
-+    fi
-+    WINE_NOTICE_WITH(unwind,[test "x$ac_cv_header_libunwind_h" != xyes],
-+                     [libunwind ${notice_platform}development files not found.])
-+fi
-+
- dnl **** Check for X11 ****
- 
- AC_PATH_XTRA
-diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
-index ed4bb94..08f094a 100644
--- a/dlls/ntdll/Makefile.in
-+++ b/dlls/ntdll/Makefile.in
-@@ -2,7 +2,7 @@ EXTRADEFS = -D_NTSYSTEM_
- MODULE    = ntdll.dll
- IMPORTLIB = ntdll
- IMPORTS   = winecrt0
-EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS)
-+EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS)
- EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
- 
- C_SRCS = \
-diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
-index 9b98894..a4aa269 100644
--- a/dlls/ntdll/signal_x86_64.c
-+++ b/dlls/ntdll/signal_x86_64.c
-@@ -51,7 +51,7 @@
- #ifdef HAVE_SYS_UCONTEXT_H
- # include <sys/ucontext.h>
- #endif
-#ifdef HAVE_LIBUNWIND_H
-+#ifdef HAVE_LIBUNWIND
- # define UNW_LOCAL_ONLY
- # include <libunwind.h>
- #endif
-@@ -1431,7 +1431,7 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex
- }
- 
- 
-#if HAVE_LIBUNWIND_H
-+#if HAVE_LIBUNWIND
- /***********************************************************************
-  *           libunwind_set_cursor_from_context
-  */
-@@ -2341,7 +2341,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex
-                 if (status != STATUS_SUCCESS) return status;
-                 got_info = TRUE;
-             }
-#if HAVE_LIBUNWIND_H
-+#if HAVE_LIBUNWIND
-             else
-             {
-                 status = libunwind_virtual_unwind( context.Rip, &got_info, &dispatch.EstablisherFrame, &new_context,
-@@ -3369,7 +3369,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec
-                 if (status != STATUS_SUCCESS) raise_status( status, rec );
-                 got_info = TRUE;
-             }
-#if HAVE_LIBUNWIND_H
-+#if HAVE_LIBUNWIND
-             else
-             {
-                 status = libunwind_virtual_unwind( context->Rip, &got_info, &dispatch.EstablisherFrame, &new_context,
-- 
-2.4.2
-
--- a/patches/configure-libunwind/definition
+++ b/patches/configure-libunwind/definition
@ -1 +0,0 @@
-Fixes: [38713] Properly check existence of libunwind before linking against it
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@ -55,7 +55,7 @@ version()
 	echo "Copyright (C) 2014-2015 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
-	echo "  commit 46bdb6e59a007b71aa6a0932228e30bf3ad8bc2b"
+	echo "  commit dedbd1883611b1c72abeb05d9f93cd5ac8af2e90"
 	echo ""
 }

@ -86,7 +86,6 @@ patch_enable_all ()
 	enable_combase_String="$1"
 	enable_comctl32_LoadIconMetric="$1"
 	enable_configure_Absolute_RPATH="$1"
-	enable_configure_libunwind="$1"
 	enable_crypt32_CMS_Certificates="$1"
 	enable_d3d11_D3D11CreateDeviceAndSwapChain="$1"
 	enable_d3d9_DesktopWindow="$1"
@ -339,9 +338,6 @@ patch_enable ()
 		configure-Absolute_RPATH)
 			enable_configure_Absolute_RPATH="$2"
 			;;
-		configure-libunwind)
-			enable_configure_libunwind="$2"
-			;;
 		crypt32-CMS_Certificates)
 			enable_crypt32_CMS_Certificates="$2"
 			;;
@ -2180,21 +2176,6 @@ if test "$enable_configure_Absolute_RPATH" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset configure-libunwind
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#38713] Properly check existence of libunwind before linking against it
-# |
-# | Modified files:
-# |   *	configure.ac, dlls/ntdll/Makefile.in, dlls/ntdll/signal_x86_64.c
-# |
-if test "$enable_configure_libunwind" -eq 1; then
-	patch_apply configure-libunwind/0001-configure-Add-libunwind-configure-flag.patch
-	(
-		echo '+    { "Sebastian Lackner", "configure: Add libunwind configure flag.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset crypt32-CMS_Certificates
 # |
 # | This patchset fixes the following Wine bugs:
@ -5096,45 +5077,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset wined3d-Multisampling
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#12652] Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE.
-# |
-# | Modified files:
-# |   *	dlls/wined3d/directx.c, dlls/wined3d/wined3d_main.c, dlls/wined3d/wined3d_private.h
-# |
-if test "$enable_wined3d_Multisampling" -eq 1; then
-	patch_apply wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch
-	(
-		echo '+    { "Austin English", "wined3d: Allow to specify multisampling AA quality levels via registry.", 1 },';
-	) >> "$patchlist"
-fi
-
-# Patchset wined3d-UnhandledBlendFactor
-# |
-# | Modified files:
-# |   *	dlls/wined3d/state.c
-# |
-if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then
-	patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch
-	(
-		echo '+    { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },';
-	) >> "$patchlist"
-fi
-
-# Patchset wined3d-wined3d_swapchain_present
-# |
-# | Modified files:
-# |   *	dlls/wined3d/swapchain.c
-# |
-if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then
-	patch_apply wined3d-wined3d_swapchain_present/0001-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch
-	(
-		echo '+    { "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset wined3d-Revert_PixelFormat
 # |
 # | This patchset fixes the following Wine bugs:
@ -5181,6 +5123,45 @@ if test "$enable_wined3d_resource_check_usage" -eq 1; then
 	) >> "$patchlist"
 fi

+# Patchset wined3d-UnhandledBlendFactor
+# |
+# | Modified files:
+# |   *	dlls/wined3d/state.c
+# |
+if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then
+	patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch
+	(
+		echo '+    { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },';
+	) >> "$patchlist"
+fi
+
+# Patchset wined3d-wined3d_swapchain_present
+# |
+# | Modified files:
+# |   *	dlls/wined3d/swapchain.c
+# |
+if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then
+	patch_apply wined3d-wined3d_swapchain_present/0001-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch
+	(
+		echo '+    { "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME.", 1 },';
+	) >> "$patchlist"
+fi
+
+# Patchset wined3d-Multisampling
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#12652] Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE.
+# |
+# | Modified files:
+# |   *	dlls/wined3d/directx.c, dlls/wined3d/wined3d_main.c, dlls/wined3d/wined3d_private.h
+# |
+if test "$enable_wined3d_Multisampling" -eq 1; then
+	patch_apply wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch
+	(
+		echo '+    { "Austin English", "wined3d: Allow to specify multisampling AA quality levels via registry.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-CSMT_Main
 # |
 # | This patchset fixes the following Wine bugs:
--- a/patches/riched20-IText_Interface/0006-riched20-Implement-ITextRange-SetRange.patch
+++ b/patches/riched20-IText_Interface/0006-riched20-Implement-ITextRange-SetRange.patch
@ -1,18 +1,18 @@
-From 4cbf20d7de172a442808f0c9a78d360ea2e57e5b Mon Sep 17 00:00:00 2001
+From 1d213a01d28a273c2b1b46dac6b606864cc88321 Mon Sep 17 00:00:00 2001
 From: Jactry Zeng <wine@jactry.com>
 Date: Wed, 13 Aug 2014 17:17:14 +0800
 Subject: riched20: Implement ITextRange::SetRange.

 ---
- dlls/riched20/richole.c       | 42 +++++++++++++++++++++++++-----------------
+ dlls/riched20/richole.c       | 41 +++++++++++++++++++++++++----------------
 dlls/riched20/tests/richole.c | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 60 insertions(+), 17 deletions(-)
+ 2 files changed, 60 insertions(+), 16 deletions(-)

 diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
-index c309292..8aea23e 100644
+index cc1a3c9..e432c79 100644
 --- a/dlls/riched20/richole.c
 +++ b/dlls/riched20/richole.c
-@@ -1990,14 +1990,36 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG Unit, LONG Inde
+@@ -2003,6 +2003,23 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG unit, LONG inde
     return E_NOTIMPL;
 }
 
@ -33,25 +33,25 @@ index c309292..8aea23e 100644
 +        *cp1 = *cp2 = len - 1;
 +}
 +
- static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG cpActive, LONG cpOther)
+ static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG active)
 {
     ITextRangeImpl *This = impl_from_ITextRange(me);
+@@ -2012,7 +2029,13 @@ static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG ac
     if (!This->child.reole)
         return CO_E_RELEASED;
 
-    FIXME("not implemented %p\n", This);
 -    return E_NOTIMPL;
-+    cp2range(This->child.reole->editor, &cpActive, &cpOther);
-+    if (cpActive == This->start && cpOther == This->end)
+    cp2range(This->child.reole->editor, &anchor, &active);
+    if (anchor == This->start && active == This->end)
 +        return S_FALSE;
 +
-+    This->start = cpActive;
-+    This->end = cpOther;
+    This->start = anchor;
+    This->end = active;
 +    return S_OK;
 }
 
 static HRESULT textrange_inrange(LONG start, LONG end, ITextRange *range, LONG *ret)
-@@ -4198,26 +4220,12 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
+@@ -4263,26 +4286,12 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
     ITextRange** ppRange)
 {
     IRichEditOleImpl *This = impl_from_ITextDocument(me);
@ -133,5 +133,5 @@ index 051d9fe..6e00b21 100644
   test_IOleWindow_GetWindow();
   test_IOleInPlaceSite_GetWindow();
 -- 
-2.4.2
+2.4.3
				`@ -1 +0,0 @@`
				`Fixes: [38713] Properly check existence of libunwind before linking against it`