diff --git a/patch-list-template.diff b/patch-list-template.diff index 640089c1..b5220458 100644 --- a/patch-list-template.diff +++ b/patch-list-template.diff @@ -47,7 +47,7 @@ index a273502..5fa0cd5 100644 +}; + +/* return the applied non-standard patches */ -+const struct wine_patch * wine_get_patches(void) ++const void * wine_get_patches(void) +{ + return &wine_patch_data[0]; +} @@ -83,7 +83,7 @@ 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,13 @@ static inline void reserve_area( void *addr, size_t size ) +@@ -79,6 +79,12 @@ static inline void reserve_area( void *addr, size_t size ) #endif /* __APPLE__ */ @@ -92,7 +92,6 @@ index ac67290..516fd82 100644 + const char *author; + const char *title; +}; -+extern void * CDECL wine_get_patches(void); + /*********************************************************************** * check_command_line @@ -113,7 +112,7 @@ index ac67290..516fd82 100644 } + if (!strcmp( argv[1], "--patches" )) + { -+ struct wine_patch *wine_patch_data = wine_get_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, @@ -124,3 +123,15 @@ index ac67290..516fd82 100644 } +diff --git a/include/wine/library.h b/include/wine/library.h +index 242bb69..aa9e585 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/patches/patch-list.patch b/patches/patch-list.patch index b50bf6fc..d7a296d1 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -48,7 +48,7 @@ index a273502..5fa0cd5 100644 + { "d7af4990da84cfe5678c36e137ffa78a", "Erich E. Hoover", "server: Store and return security attributes with extended file attributes." }, + { "9d2fc8ba3a12f0b54dfd788a6d904484", "Erich E. Hoover", "ntdll: Inherit security attributes from parent directories." }, + { "31df02dc75b2e280aee57c1b46de2389", "Erich E. Hoover", "kernel32: Allow string comparison with linguistic casing." }, -+ { "1ab664be0bc24759d667ffd8ce907b97", "Sebastian Lackner", "quartz/tests: Add tests for IVMRMonitorConfig and IVMRMonitorConfig9 interface" }, ++ { "9d87b96b61d2d7ce620bc19dc6c8b3af", "Sebastian Lackner", "quartz/tests: Add tests for IVMRMonitorConfig and IVMRMonitorConfig9 interface" }, + { "102b21f7108d936a8e9a581d34354795", "Sebastian Lackner", "winex11: Update gl_drawable for embedded windows" }, + { "c8958b63e6afe0335d46da9b46520279", "Sebastian Lackner", "kernel32: Change return value of stub SetNamedPipeHandleState to TRUE" }, + { "a4ead552f0e423b4701116f6a7dbe521", "Sebastian Lackner", "winex11: Enable/disable windows when they are (un)mapped by foreign applications" }, @@ -57,7 +57,7 @@ index a273502..5fa0cd5 100644 +}; + +/* return the applied non-standard patches */ -+const struct wine_patch * wine_get_patches(void) ++const void * wine_get_patches(void) +{ + return &wine_patch_data[0]; +} @@ -93,7 +93,7 @@ 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,13 @@ static inline void reserve_area( void *addr, size_t size ) +@@ -79,6 +79,12 @@ static inline void reserve_area( void *addr, size_t size ) #endif /* __APPLE__ */ @@ -102,7 +102,6 @@ index ac67290..516fd82 100644 + const char *author; + const char *title; +}; -+extern void * CDECL wine_get_patches(void); + /*********************************************************************** * check_command_line @@ -123,7 +122,7 @@ index ac67290..516fd82 100644 } + if (!strcmp( argv[1], "--patches" )) + { -+ struct wine_patch *wine_patch_data = wine_get_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, @@ -134,3 +133,15 @@ index ac67290..516fd82 100644 } +diff --git a/include/wine/library.h b/include/wine/library.h +index 242bb69..aa9e585 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 );