diff --git a/debian/tools/generate-patchlist.sh b/debian/tools/generate-patchlist.sh index a0163d7c..bc93c629 100755 --- a/debian/tools/generate-patchlist.sh +++ b/debian/tools/generate-patchlist.sh @@ -26,37 +26,6 @@ From: "FDS-Team" Subject: Autogenerated patch list. --- -diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index 8bd4eb7..4b4c318 100644 ---- a/dlls/ntdll/misc.c -+++ b/dlls/ntdll/misc.c -@@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void) - } - - /********************************************************************* -+ * wine_get_patches (NTDLL.@) -+ */ -+const void * CDECL NTDLL_wine_get_patches(void) -+{ -+ return wine_get_patches(); -+} -+ -+/********************************************************************* - * wine_get_build_id (NTDLL.@) - */ - const char * CDECL NTDLL_wine_get_build_id(void) -diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 70bf94f..42eddcf 100644 ---- a/dlls/ntdll/ntdll.spec -+++ b/dlls/ntdll/ntdll.spec -@@ -1410,6 +1410,7 @@ - - # Version - @ cdecl wine_get_version() NTDLL_wine_get_version -+@ cdecl wine_get_patches() NTDLL_wine_get_patches - @ cdecl wine_get_build_id() NTDLL_wine_get_build_id - @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version - diff --git a/libs/wine/config.c b/libs/wine/config.c index a273502..5fa0cd5 100644 --- a/libs/wine/config.c @@ -107,50 +76,6 @@ index 2159fac..7cb2918 100644 wine_init; wine_init_argv0_path; wine_is_dbcs_leadbyte; -diff --git a/loader/main.c b/loader/main.c -index ac67290..516fd82 100644 ---- a/loader/main.c -+++ b/loader/main.c -@@ -79,6 +79,12 @@ static inline void reserve_area( void *addr, size_t size ) - - #endif /* __APPLE__ */ - -+struct wine_patch { -+ const char *hash; -+ const char *author; -+ const char *title; -+}; -+ - /*********************************************************************** - * check_command_line - * -@@ -89,7 +96,8 @@ static void check_command_line( int argc, char *argv[] ) - static const char usage[] = - "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" - " wine --help Display this help and exit\n" -- " wine --version Output version information and exit"; -+ " wine --version Output version information and exit\n" -+ " wine --patches Output patch information and exit"; - - if (argc <= 1) - { -@@ -106,6 +114,16 @@ static void check_command_line( int argc, char *argv[] ) - printf( "%s\n", wine_get_build_id() ); - exit(0); - } -+ if (!strcmp( argv[1], "--patches" )) -+ { -+ const struct wine_patch *wine_patch_data = wine_get_patches(); -+ for(; wine_patch_data->hash != NULL; wine_patch_data++) -+ { -+ printf( "%s :: %s :: %s\n", wine_patch_data->hash, wine_patch_data->author, -+ wine_patch_data->title ); -+ } -+ exit(0); -+ } - } - - diff --git a/include/wine/library.h b/include/wine/library.h index 242bb69..aa9e585 100644 --- a/include/wine/library.h diff --git a/patches/00-Commandline/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch b/patches/00-Commandline/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch new file mode 100644 index 00000000..e9abea53 --- /dev/null +++ b/patches/00-Commandline/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch @@ -0,0 +1,89 @@ +From d88eb32e40bff9b8279f57b13a5f2cc09a9273ea Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Thu, 29 May 2014 23:43:45 +0200 +Subject: loader: Add commandline option --patches to show the patch list. + +--- + dlls/ntdll/misc.c | 8 ++++++++ + dlls/ntdll/ntdll.spec | 1 + + loader/main.c | 19 ++++++++++++++++++- + 3 files changed, 27 insertions(+), 1 deletion(-) + +diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c +index 8bd4eb7..4b4c318 100644 +--- a/dlls/ntdll/misc.c ++++ b/dlls/ntdll/misc.c +@@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void) + } + + /********************************************************************* ++ * wine_get_patches (NTDLL.@) ++ */ ++const void * CDECL NTDLL_wine_get_patches(void) ++{ ++ return wine_get_patches(); ++} ++ ++/********************************************************************* + * wine_get_build_id (NTDLL.@) + */ + const char * CDECL NTDLL_wine_get_build_id(void) +diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec +index 5bac269..ab50882 100644 +--- a/dlls/ntdll/ntdll.spec ++++ b/dlls/ntdll/ntdll.spec +@@ -1419,6 +1419,7 @@ + + # Version + @ cdecl wine_get_version() NTDLL_wine_get_version ++@ cdecl wine_get_patches() NTDLL_wine_get_patches + @ cdecl wine_get_build_id() NTDLL_wine_get_build_id + @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version + +diff --git a/loader/main.c b/loader/main.c +index ac67290..71e5055 100644 +--- a/loader/main.c ++++ b/loader/main.c +@@ -79,6 +79,12 @@ static inline void reserve_area( void *addr, size_t size ) + + #endif /* __APPLE__ */ + ++struct wine_patch { ++ const char *hash; ++ const char *author; ++ const char *title; ++}; ++ + /*********************************************************************** + * check_command_line + * +@@ -89,7 +95,8 @@ static void check_command_line( int argc, char *argv[] ) + static const char usage[] = + "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" + " wine --help Display this help and exit\n" +- " wine --version Output version information and exit"; ++ " wine --version Output version information and exit\n" ++ " wine --patches Output patch information and exit"; + + if (argc <= 1) + { +@@ -106,6 +113,16 @@ static void check_command_line( int argc, char *argv[] ) + printf( "%s\n", wine_get_build_id() ); + exit(0); + } ++ if (!strcmp( argv[1], "--patches" )) ++ { ++ const struct wine_patch *wine_patch_data = wine_get_patches(); ++ for(; wine_patch_data->hash != NULL; wine_patch_data++) ++ { ++ printf( "%s :: %s :: %s\n", wine_patch_data->hash, wine_patch_data->author, ++ wine_patch_data->title ); ++ } ++ exit(0); ++ } + } + + +-- +1.7.9.5 + diff --git a/patches/00-Commandline/1b7ac850-5040-4d9e-8fde-9c483c3baf33.def b/patches/00-Commandline/1b7ac850-5040-4d9e-8fde-9c483c3baf33.def new file mode 100644 index 00000000..4797552d --- /dev/null +++ b/patches/00-Commandline/1b7ac850-5040-4d9e-8fde-9c483c3baf33.def @@ -0,0 +1,3 @@ +Revision: 1 +Author: Sebastian Lackner +Title: Add commandline option --patches to show the patch list. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index 8c192f30..c3c5203e 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -2,42 +2,11 @@ From: "FDS-Team" Subject: Autogenerated patch list. --- -diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index 8bd4eb7..4b4c318 100644 ---- a/dlls/ntdll/misc.c -+++ b/dlls/ntdll/misc.c -@@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void) - } - - /********************************************************************* -+ * wine_get_patches (NTDLL.@) -+ */ -+const void * CDECL NTDLL_wine_get_patches(void) -+{ -+ return wine_get_patches(); -+} -+ -+/********************************************************************* - * wine_get_build_id (NTDLL.@) - */ - const char * CDECL NTDLL_wine_get_build_id(void) -diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 70bf94f..42eddcf 100644 ---- a/dlls/ntdll/ntdll.spec -+++ b/dlls/ntdll/ntdll.spec -@@ -1410,6 +1410,7 @@ - - # Version - @ cdecl wine_get_version() NTDLL_wine_get_version -+@ cdecl wine_get_patches() NTDLL_wine_get_patches - @ cdecl wine_get_build_id() NTDLL_wine_get_build_id - @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version - diff --git a/libs/wine/config.c b/libs/wine/config.c index a273502..5fa0cd5 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c -@@ -478,6 +478,38 @@ const char *wine_get_version(void) +@@ -478,6 +478,39 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } @@ -46,6 +15,7 @@ index a273502..5fa0cd5 100644 + const char *author; + const char *title; +} wine_patch_data[] = { ++ { "1b7ac850-5040-4d9e-8fde-9c483c3baf33:1", "Sebastian Lackner", "Add commandline option --patches to show the patch list." }, + { "8a366b6d-8ad6-4581-8aa9-66a03590a57b:2", "Erich E. Hoover", "Implement SIO_ADDRESS_LIST_CHANGE." }, + { "92938b89-506b-430a-ba50-32de8b286e56:4", "Erich E. Hoover", "Store and return security attributes with extended file attributes." }, + { "5d6bb7b5-ec88-4ed3-907d-9ad2173a2f88:1", "Sebastian Lackner", "Enable/disable windows when they are (un)mapped by foreign applications." }, @@ -100,50 +70,6 @@ index 2159fac..7cb2918 100644 wine_init; wine_init_argv0_path; wine_is_dbcs_leadbyte; -diff --git a/loader/main.c b/loader/main.c -index ac67290..516fd82 100644 ---- a/loader/main.c -+++ b/loader/main.c -@@ -79,6 +79,12 @@ static inline void reserve_area( void *addr, size_t size ) - - #endif /* __APPLE__ */ - -+struct wine_patch { -+ const char *hash; -+ const char *author; -+ const char *title; -+}; -+ - /*********************************************************************** - * check_command_line - * -@@ -89,7 +96,8 @@ static void check_command_line( int argc, char *argv[] ) - static const char usage[] = - "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" - " wine --help Display this help and exit\n" -- " wine --version Output version information and exit"; -+ " wine --version Output version information and exit\n" -+ " wine --patches Output patch information and exit"; - - if (argc <= 1) - { -@@ -106,6 +114,16 @@ static void check_command_line( int argc, char *argv[] ) - printf( "%s\n", wine_get_build_id() ); - exit(0); - } -+ if (!strcmp( argv[1], "--patches" )) -+ { -+ const struct wine_patch *wine_patch_data = wine_get_patches(); -+ for(; wine_patch_data->hash != NULL; wine_patch_data++) -+ { -+ printf( "%s :: %s :: %s\n", wine_patch_data->hash, wine_patch_data->author, -+ wine_patch_data->title ); -+ } -+ exit(0); -+ } - } - - diff --git a/include/wine/library.h b/include/wine/library.h index 242bb69..aa9e585 100644 --- a/include/wine/library.h