From fa73044dd60bae90b9a5ec850205a07579d4db17 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 29 May 2014 23:43:45 +0200 Subject: [PATCH] loader: Add commandline option --patches to show the patch list. --- dlls/ntdll/misc.c | 8 ++++++++ dlls/ntdll/ntdll.spec | 1 + include/wine/library.h | 1 + libs/wine/config.c | 6 ++++++ libs/wine/wine.map | 1 + loader/main.c | 42 +++++++++++++++++++++++++++++++++++++++++- 6 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index bb75d9c..21e2db6 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -61,6 +61,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 292b0f6..fb45a94 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1516,6 +1516,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/include/wine/library.h b/include/wine/library.h index 242bb69..fae73fe 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void); extern const char *wine_get_server_dir(void); extern const char *wine_get_user_name(void); extern const char *wine_get_version(void); +extern const void *wine_get_patches(void); extern const char *wine_get_build_id(void); extern void wine_init_argv0_path( const char *argv0 ); extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ); diff --git a/libs/wine/config.c b/libs/wine/config.c index 3c9110b..5da6263 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -522,6 +522,12 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } +/* return the applied non-standard patches */ +const void *wine_get_patches(void) +{ + return NULL; +} + /* return the build id string */ const char *wine_get_build_id(void) { diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 2159fac..7cb2918 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -90,6 +90,7 @@ WINE_1.0 wine_get_ss; wine_get_user_name; wine_get_version; + wine_get_patches; wine_init; wine_init_argv0_path; wine_is_dbcs_leadbyte; diff --git a/loader/main.c b/loader/main.c index f197cf8..f662912 100644 --- a/loader/main.c +++ b/loader/main.c @@ -54,7 +54,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) { @@ -71,6 +72,45 @@ 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 + { + const char *author; + const char *subject; + int revision; + } + *next, *cur = wine_get_patches(); + + if (!cur) + { + fprintf( stderr, "Patchlist not available.\n" ); + exit(1); + } + + while (cur->author) + { + next = cur + 1; + while (next->author) + { + if (strcmp( cur->author, next->author )) break; + next++; + } + + printf( "%s (%d):\n", cur->author, (int)(next - cur) ); + while (cur < next) + { + printf( " %s", cur->subject ); + if (cur->revision != 1) + printf( " [rev %d]", cur->revision ); + printf( "\n" ); + cur++; + } + printf( "\n" ); + } + + exit(0); + } } -- 1.9.1