Added patch to change winedbg bug reporting URL to bugs.wine-staging.com.

debian/changelog

@@ -16,6 +16,7 @@ wine-compholio (1.7.32) UNRELEASED; urgency=low
   * Added patch to add additional format conversions for DXT1 and DXT3.
   * Added patch to implement stubs for additional api-ms-win-core-* dlls.
   * Added patch to fix copy and paste error recently introduced in ws2_32 tests.
+  * Added patch to change bug reporting URL in winedbg.
   * Removed patch to close server fd is there is no space in thread inflight fd list (accepted upstream).
   * Removed patch to fix bugs in StrStr functions (accepted upstream).
   * Removed patches to avoid sending messages in FindWindowExW (accepted upstream).

patches/Makefile

@@ -231,16 +231,23 @@ Pipelight.ok:
 # |
 # | Modified files:
 # |   *	dlls/kernel32/process.c, dlls/ntdll/misc.c, dlls/ntdll/ntdll.spec, include/wine/library.h, libs/wine/Makefile.in,
-# | 	libs/wine/config.c, libs/wine/loader.c, libs/wine/wine.def, libs/wine/wine.map, loader/main.c
+# | 	libs/wine/config.c, libs/wine/loader.c, libs/wine/wine.def, libs/wine/wine.map, loader/main.c, po/ar.po, po/bg.po,
+# | 	po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/en.po, po/en_US.po, po/eo.po, po/es.po, po/fa.po, po/fi.po,
+# | 	po/fr.po, po/he.po, po/hi.po, po/hr.po, po/hu.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/ml.po, po/nb_NO.po,
+# | 	po/nl.po, po/or.po, po/pa.po, po/pl.po, po/pt_BR.po, po/pt_PT.po, po/rm.po, po/ro.po, po/ru.po, po/sk.po, po/sl.po,
+# | 	po/sr_RS@cyrillic.po, po/sr_RS@latin.po, po/sv.po, po/te.po, po/th.po, po/tr.po, po/uk.po, po/wa.po, po/wine.pot,
+# | 	po/zh_CN.po, po/zh_TW.po, programs/winedbg/winedbg.rc
 # |
 .INTERMEDIATE: Staging.ok
 Staging.ok:
 	$(call APPLY_FILE,Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch)
-	$(call APPLY_FILE,Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch)
-	$(call APPLY_FILE,Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch)
-	$(call APPLY_FILE,Staging/0004-loader-Add-commandline-option-check-libs.patch)
+	$(call APPLY_FILE,Staging/0002-winedbg-Change-bug-reporting-URL-to-Wine-Staging.patch)
+	$(call APPLY_FILE,Staging/0003-winelib-Append-Staging-at-the-end-of-the-version-s.patch)
+	$(call APPLY_FILE,Staging/0004-loader-Add-commandline-option-patches-to-show-the-pa.patch)
+	$(call APPLY_FILE,Staging/0005-loader-Add-commandline-option-check-libs.patch)
 	@( \
 		echo '+    { "Sebastian Lackner", "kernel32: Add winediag message to show warning, that this isn'\''t vanilla wine.", 1 },'; \
+		echo '+    { "Sebastian Lackner", "winedbg: Change bug reporting URL to Wine Staging.", 1 },'; \
 		echo '+    { "Sebastian Lackner", "winelib: Append '\''(Staging)'\'' at the end of the version string.", 1 },'; \
 		echo '+    { "Sebastian Lackner", "loader: Add commandline option --patches to show the patch list.", 1 },'; \
 		echo '+    { "Michael Müller", "loader: Add commandline option --check-libs.", 1 },'; \

patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch

@@ -1,15 +1,15 @@
-From 3e4695fd4eab3f7666cd5361f98f2ace34c43739 Mon Sep 17 00:00:00 2001
+From 948a8706d6045fb6f8f624072bfa6ab97e91dc16 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: kernel32: Add winediag message to show warning, that this isn't
  vanilla wine.
 
 ---
- dlls/kernel32/process.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
+ dlls/kernel32/process.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 301c64a..5c5be22 100644
+index 0a087ab..1052a79 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
 @@ -65,6 +65,7 @@
@@ -20,23 +20,22 @@ index 301c64a..5c5be22 100644
  
  #ifdef __APPLE__
  extern char **__wine_get_main_environment(void);
-@@ -1092,6 +1093,16 @@ static DWORD WINAPI start_process( PEB *peb )
+@@ -1099,6 +1100,15 @@ static DWORD WINAPI start_process( PEB *peb )
          DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(),
                   debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry );
  
 +    /* Wine developers don't like it, when bug are reported with Wine versions containing our patches. */
 +    if (CreateEventA(0, 0, 0, "__winestaging_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS)
 +    {
-+        FIXME_(winediag)("Wine Staging is a Wine testing version containing experimental patches.\n");
-+        FIXME_(winediag)("Please don't report bugs at winehq.org and use our issue tracker instead:\n");
-+        FIXME_(winediag)("https://github.com/wine-compholio/wine-staging/issues\n");
++        FIXME_(winediag)("Wine Staging is a testing version containing experimental patches.\n");
++        FIXME_(winediag)("Please report bugs at http://bugs.wine-staging.com (instead of winehq.org).\n");
 +    }
 +    else
-+        WARN_(winediag)("Wine Staging is a Wine testing version containing experimental patches.\n");
++        WARN_(winediag)("Wine Staging is a testing version containing experimental patches.\n");
 +
      SetLastError( 0 );  /* clear error code */
      if (peb->BeingDebugged) DbgBreakPoint();
      return call_process_entry( peb, entry );
 -- 
-2.1.1
+2.1.3