Merge branch 'master' of github.com:wine-compholio/wine-staging

patches/Makefile

@@ -19,9 +19,9 @@ APPLY_FILE = @echo "Applying $(1)"; $(APPLY) < "$(CURDIR)/$(1)"
 #
 
 PATCHLIST := \
-	Compholio.ok \
 	Miscellaneous.ok \
 	Pipelight.ok \
+	Staging.ok \
 	atl-IOCS_Property.ok \
 	comctl32-LoadIconMetric.ok \
 	configure-Absolute_RPATH.ok \
@@ -154,31 +154,6 @@ clean:
 	rm -f series patchlist.diff
 	rm -f *.ok
 
-# Patchset Compholio
-# |
-# | Included patches:
-# |   *	Add winediag message to show warning, that this isn't vanilla wine. [by Sebastian Lackner]
-# |   *	Append '(Compholio)' at the end of the version string. [by Sebastian Lackner]
-# |   *	Add commandline option --patches to show the patch list. [by Sebastian Lackner]
-# |   *	Add commandline option --check-libs to test if shared libraries are installed. [by Michael Müller]
-# |
-# | 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
-# |
-.INTERMEDIATE: Compholio.ok
-Compholio.ok:
-	$(call APPLY_FILE,Compholio/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch)
-	$(call APPLY_FILE,Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch)
-	$(call APPLY_FILE,Compholio/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch)
-	$(call APPLY_FILE,Compholio/0004-loader-Add-commandline-option-check-libs.patch)
-	@( \
-		echo '+    { "Compholio", "Sebastian Lackner", "Add winediag message to show warning, that this isn'\''t vanilla wine." },'; \
-		echo '+    { "Compholio", "Sebastian Lackner", "Append '\''(Compholio)'\'' at the end of the version string." },'; \
-		echo '+    { "Compholio", "Sebastian Lackner", "Add commandline option --patches to show the patch list." },'; \
-		echo '+    { "Compholio", "Michael Müller", "Add commandline option --check-libs to test if shared libraries are installed." },'; \
-	) > Compholio.ok
-
 # Patchset Miscellaneous
 # |
 # | Included patches:
@@ -233,6 +208,31 @@ Pipelight.ok:
 		echo '+    { "Pipelight", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." },'; \
 	) > Pipelight.ok
 
+# Patchset Staging
+# |
+# | Included patches:
+# |   *	Add winediag message to show warning, that this isn't vanilla wine. [by Sebastian Lackner]
+# |   *	Append '(Staging)' at the end of the version string. [by Sebastian Lackner]
+# |   *	Add commandline option --patches to show the patch list. [by Sebastian Lackner]
+# |   *	Add commandline option --check-libs to test if shared libraries are installed. [by Michael Müller]
+# |
+# | 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
+# |
+.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)
+	@( \
+		echo '+    { "Staging", "Sebastian Lackner", "Add winediag message to show warning, that this isn'\''t vanilla wine." },'; \
+		echo '+    { "Staging", "Sebastian Lackner", "Append '\''(Staging)'\'' at the end of the version string." },'; \
+		echo '+    { "Staging", "Sebastian Lackner", "Add commandline option --patches to show the patch list." },'; \
+		echo '+    { "Staging", "Michael Müller", "Add commandline option --check-libs to test if shared libraries are installed." },'; \
+	) > Staging.ok
+
 # Patchset atl-IOCS_Property
 # |
 # | Included patches:

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

@@ -25,14 +25,14 @@ index 301c64a..5c5be22 100644
                   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, "__winecompholio_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS)
++    if (CreateEventA(0, 0, 0, "__winestaging_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS)
 +    {
-+        FIXME_(winediag)("Wine-Compholio is a Wine testing version containing experimental patches.\n");
++        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/compholio/wine-compholio/issues\n");
++        FIXME_(winediag)("https://github.com/wine-compholio/wine-staging/issues\n");
 +    }
 +    else
-+        WARN_(winediag)("Wine-Compholio is a Wine testing version containing experimental patches.\n");
++        WARN_(winediag)("Wine Staging is a Wine testing version containing experimental patches.\n");
 +
      SetLastError( 0 );  /* clear error code */
      if (peb->BeingDebugged) DbgBreakPoint();

patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch

@@ -1,7 +1,7 @@
 From 0e76401ae2de47285c66ee0b59bdf7449136d060 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
-Subject: winelib: Append '(Compholio)' at the end of the version string.
+Subject: winelib: Append '(Staging)' at the end of the version string.
 
 ---
  libs/wine/Makefile.in | 2 +-
@@ -16,7 +16,7 @@ index c961ba5..776168c 100644
  
  version.c: dummy
 -	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
-+	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Compholio)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
++	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-@PACKAGE_VERSION@") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
  
  # Make sure that make_makefiles sees the generated rules
  .PHONY: install install-lib install-dev uninstall

patches/Staging/definition

@@ -3,7 +3,7 @@ Subject: Add winediag message to show warning, that this isn't vanilla wine.
 Revision: 1
 
 Author: Sebastian Lackner
-Subject: Append '(Compholio)' at the end of the version string.
+Subject: Append '(Staging)' at the end of the version string.
 Revision: 1
 
 Author: Sebastian Lackner

patches/ntdll-WRITECOPY/0005-ntdll-Only-enable-true-WRITECOPY-protection-when-a-s.patch

@@ -26,7 +26,7 @@ index d26fe26..02e32fb 100644
 +    static int enabled = -1;
 +    if (enabled == -1)
 +    {
-+        const char *str = getenv("COMPHOLIO_WRITECOPY");
++        const char *str = getenv("STAGING_WRITECOPY");
 +        enabled = str && (atoi(str) != 0);
 +    }
 +    return enabled;

patches/winemenubuilder-Desktop_Icon_Path/0001-winemenubuilder-Create-desktop-shortcuts-with-absolu.patch

@@ -3,8 +3,8 @@ From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 24 Sep 2014 21:13:59 +0200
 Subject: winemenubuilder: Create desktop shortcuts with absolute wine path.
 
-When having multiple wine versions installed (for example regular wine and wine-compholio), the desktop
-shortcuts will always run regular wine, even if the app was installed with wine-compholio. This patch
+When having multiple wine versions installed (for example regular wine and wine staging), the desktop
+shortcuts will always run regular wine, even if the app was installed with wine staging. This patch
 changes the behaviour to use the absolute wine path in desktop shortcuts. The patch only modifies the
 behaviour on Linux, because some other distros are a bit special (FreeBSD requires a wrapper to start
 wine, and so on ...).