From 2616a89d50f4c1fab7c12ba4c4340cfe8d5f4198 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 2 Oct 2014 20:04:58 +0200 Subject: [PATCH] Show winediag message informing about applied patches, append '(Compholio)' to wine --version string. --- debian/changelog | 1 + ...ediag-message-to-show-warning-that-t.patch | 42 +++++++++++++++++ ...ompholio-at-the-end-of-the-version-s.patch | 25 ++++++++++ ...dline-option-patches-to-show-the-pa.patch} | 0 ...r-Add-commandline-option-check-libs.patch} | 0 .../definition | 8 ++++ patches/Makefile | 46 +++++++++++-------- 7 files changed, 102 insertions(+), 20 deletions(-) create mode 100644 patches/Compholio/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch create mode 100644 patches/Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch rename patches/{loader-Cmdline_Diagnostics/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch => Compholio/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch} (100%) rename patches/{loader-Cmdline_Diagnostics/0002-loader-Add-commandline-option-check-libs.patch => Compholio/0004-loader-Add-commandline-option-check-libs.patch} (100%) rename patches/{loader-Cmdline_Diagnostics => Compholio}/definition (51%) diff --git a/debian/changelog b/debian/changelog index 49879f3e..0e52cd02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ wine-compholio (1.7.28) UNRELEASED; urgency=low * Added patch to limit cross thread access to ImmSet* functions. * Added patch for IRichEditOle and ITextDocument support for ITextServices. * Added patch to fix implementation of SH*Shared commands. + * Added patches to make clearly visible, that this is a patched wine version. * Removed patch to support FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW (accepted upstream). * Removed patch to fix implementation of SH*Shared commands (accepted upstream). * Removed patch to export ?_BADOFF@std@@3_JB on both i386 and win64 (accepted upstream). diff --git a/patches/Compholio/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch b/patches/Compholio/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch new file mode 100644 index 00000000..175bd470 --- /dev/null +++ b/patches/Compholio/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch @@ -0,0 +1,42 @@ +From 3e4695fd4eab3f7666cd5361f98f2ace34c43739 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +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(+) + +diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c +index 301c64a..5c5be22 100644 +--- a/dlls/kernel32/process.c ++++ b/dlls/kernel32/process.c +@@ -65,6 +65,7 @@ + WINE_DEFAULT_DEBUG_CHANNEL(process); + WINE_DECLARE_DEBUG_CHANNEL(file); + WINE_DECLARE_DEBUG_CHANNEL(relay); ++WINE_DECLARE_DEBUG_CHANNEL(winediag); + + #ifdef __APPLE__ + extern char **__wine_get_main_environment(void); +@@ -1092,6 +1093,16 @@ 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, "__winecompholio_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS) ++ { ++ FIXME_(winediag)("Wine-Compholio 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"); ++ } ++ else ++ WARN_(winediag)("Wine-Compholio is a Wine testing version containing experimental patches.\n"); ++ + SetLastError( 0 ); /* clear error code */ + if (peb->BeingDebugged) DbgBreakPoint(); + return call_process_entry( peb, entry ); +-- +2.1.1 + diff --git a/patches/Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch b/patches/Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch new file mode 100644 index 00000000..662b5839 --- /dev/null +++ b/patches/Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch @@ -0,0 +1,25 @@ +From 0e76401ae2de47285c66ee0b59bdf7449136d060 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Thu, 2 Oct 2014 19:53:46 +0200 +Subject: winelib: Append '(Compholio') at the end of the version string. + +--- + libs/wine/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in +index c961ba5..776168c 100644 +--- a/libs/wine/Makefile.in ++++ b/libs/wine/Makefile.in +@@ -105,7 +105,7 @@ config_EXTRADEFS = \ + -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" + + 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) + + # Make sure that make_makefiles sees the generated rules + .PHONY: install install-lib install-dev uninstall +-- +2.1.1 + diff --git a/patches/loader-Cmdline_Diagnostics/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch b/patches/Compholio/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch similarity index 100% rename from patches/loader-Cmdline_Diagnostics/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch rename to patches/Compholio/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch diff --git a/patches/loader-Cmdline_Diagnostics/0002-loader-Add-commandline-option-check-libs.patch b/patches/Compholio/0004-loader-Add-commandline-option-check-libs.patch similarity index 100% rename from patches/loader-Cmdline_Diagnostics/0002-loader-Add-commandline-option-check-libs.patch rename to patches/Compholio/0004-loader-Add-commandline-option-check-libs.patch diff --git a/patches/loader-Cmdline_Diagnostics/definition b/patches/Compholio/definition similarity index 51% rename from patches/loader-Cmdline_Diagnostics/definition rename to patches/Compholio/definition index 2b391ba9..f7251693 100644 --- a/patches/loader-Cmdline_Diagnostics/definition +++ b/patches/Compholio/definition @@ -1,3 +1,11 @@ +Author: Sebastian Lackner +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. +Revision: 1 + Author: Sebastian Lackner Subject: Add commandline option --patches to show the patch list. Revision: 1 diff --git a/patches/Makefile b/patches/Makefile index 7675bd89..9b3ed121 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -19,6 +19,7 @@ APPLY_FILE = @echo "Applying $(1)"; $(APPLY) < "$(CURDIR)/$(1)" # PATCHLIST := \ + Compholio.ok \ Miscellaneous.ok \ Pipelight.ok \ atl-IOCS_Property.ok \ @@ -38,7 +39,6 @@ PATCHLIST := \ kernel32-Named_Pipe.ok \ kernel32-SystemFileCacheSize.ok \ libs-Unicode_Collation.ok \ - loader-Cmdline_Diagnostics.ok \ ntdll-DOS_Attributes.ok \ ntdll-Dynamic_DST.ok \ ntdll-Exception.ok \ @@ -137,6 +137,31 @@ 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: @@ -505,25 +530,6 @@ libs-Unicode_Collation.ok: echo '+ { "libs-Unicode_Collation", "Dmitry Timoshkov", "Fix comparison of punctuation characters." },'; \ ) > libs-Unicode_Collation.ok -# Patchset loader-Cmdline_Diagnostics -# | -# | Included patches: -# | * 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/ntdll/misc.c, dlls/ntdll/ntdll.spec, include/wine/library.h, libs/wine/config.c, libs/wine/loader.c, -# | libs/wine/wine.def, libs/wine/wine.map, loader/main.c -# | -.INTERMEDIATE: loader-Cmdline_Diagnostics.ok -loader-Cmdline_Diagnostics.ok: - $(call APPLY_FILE,loader-Cmdline_Diagnostics/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch) - $(call APPLY_FILE,loader-Cmdline_Diagnostics/0002-loader-Add-commandline-option-check-libs.patch) - @( \ - echo '+ { "loader-Cmdline_Diagnostics", "Sebastian Lackner", "Add commandline option --patches to show the patch list." },'; \ - echo '+ { "loader-Cmdline_Diagnostics", "Michael Müller", "Add commandline option --check-libs to test if shared libraries are installed." },'; \ - ) > loader-Cmdline_Diagnostics.ok - # Patchset ntdll-DOS_Attributes # | # | Included patches: