diff --git a/patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch index 1cd41e4a..cbc5169d 100644 --- a/patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch @@ -1,4 +1,4 @@ -From 5ec2d0aa8425dcc9a80a0693946973ca36207e76 Mon Sep 17 00:00:00 2001 +From 4ed59d0fd1b3e80073d39eb18155b8e8149ec687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 Jan 2016 13:48:54 +0100 Subject: api-ms-win-core-libraryloader-l1-2-0: Add dll. @@ -13,17 +13,17 @@ Subject: api-ms-win-core-libraryloader-l1-2-0: Add dll. create mode 100644 dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec diff --git a/configure.ac b/configure.ac -index aca3374..be563ca 100644 +index bedf093..a2a4f84 100644 --- a/configure.ac +++ b/configure.ac -@@ -2652,6 +2652,7 @@ WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) +@@ -2664,6 +2664,7 @@ WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) + WINE_CONFIG_DLL(api-ms-win-core-localization-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) - WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-0/Makefile.in b/dlls/api-ms-win-core-libraryloader-l1-2-0/Makefile.in new file mode 100644 index 0000000..5552133 @@ -67,10 +67,10 @@ index 0000000..6c385b6 +@ stub SetDefaultDllDirectories +@ stdcall SizeofResource(long long) kernel32.SizeofResource diff --git a/tools/make_specfiles b/tools/make_specfiles -index 6456efe..09cc4d4 100755 +index 5018987..3d912ff 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -214,6 +214,7 @@ my @dll_groups = +@@ -215,6 +215,7 @@ my @dll_groups = "user32", "api-ms-win-core-libraryloader-l1-1-0", "api-ms-win-core-libraryloader-l1-1-1", @@ -79,5 +79,5 @@ index 6456efe..09cc4d4 100755 [ "kernel32", -- -2.6.4 +2.7.0 diff --git a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch index f4230647..36fec5d6 100644 --- a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch @@ -1,4 +1,4 @@ -From 786eb78cf9eff284eae02b88bdefebad21b1fab5 Mon Sep 17 00:00:00 2001 +From 753cae8f8c0bdca9cba110c36a59952032fb5ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 16 Jan 2016 20:01:49 +0100 Subject: api-ms-win-core-kernel32-legacy-l1-1-1: Add dll. @@ -13,10 +13,10 @@ Subject: api-ms-win-core-kernel32-legacy-l1-1-1: Add dll. create mode 100644 dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec diff --git a/configure.ac b/configure.ac -index be563ca..36d95c9 100644 +index a2a4f84..8303468 100644 --- a/configure.ac +++ b/configure.ac -@@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) +@@ -2662,6 +2662,7 @@ WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) @@ -53,7 +53,7 @@ index 0000000..579e254 +@ stdcall SetVolumeMountPointW(wstr wstr) kernel32.SetVolumeMountPointW +@ stdcall VerifyVersionInfoW(long long int64) kernel32.VerifyVersionInfoW diff --git a/tools/make_specfiles b/tools/make_specfiles -index 09cc4d4..03e753f 100755 +index 3d912ff..df6254b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -188,6 +188,7 @@ my @dll_groups = @@ -61,9 +61,9 @@ index 09cc4d4..03e753f 100755 "api-ms-win-core-io-l1-1-1", "api-ms-win-core-kernel32-legacy-l1-1-0", + "api-ms-win-core-kernel32-legacy-l1-1-1", + "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", "api-ms-win-core-localization-obsolete-l1-1-0", - "api-ms-win-core-memory-l1-1-0", -- -2.6.4 +2.7.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 37e9829d..45d76d07 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "ea85a1ca598228eeacc370b0d827ca9e11387dfe" + echo "e776421232996729a0e350c31d56f696bd47e429" } # Show version information @@ -266,7 +266,6 @@ patch_enable_all () enable_server_Desktop_Refcount="$1" enable_server_FileEndOfFileInformation="$1" enable_server_File_Permissions="$1" - enable_server_Fix_Leak="$1" enable_server_Inherited_ACLs="$1" enable_server_Key_State="$1" enable_server_Map_EXDEV_Error="$1" @@ -950,9 +949,6 @@ patch_enable () server-File_Permissions) enable_server_File_Permissions="$2" ;; - server-Fix_Leak) - enable_server_Fix_Leak="$2" - ;; server-Inherited_ACLs) enable_server_Inherited_ACLs="$2" ;; @@ -5634,18 +5630,6 @@ if test "$enable_server_FileEndOfFileInformation" -eq 1; then ) >> "$patchlist" fi -# Patchset server-Fix_Leak -# | -# | Modified files: -# | * server/object.c -# | -if test "$enable_server_Fix_Leak" -eq 1; then - patch_apply server-Fix_Leak/0001-server-Fix-newly-introduced-memory-leak-of-object-na.patch - ( - echo '+ { "Sebastian Lackner", "server: Fix newly introduced memory leak of object name structure.", 1 },'; - ) >> "$patchlist" -fi - # Patchset server-Stored_ACLs # | # | This patchset has the following (direct or indirect) dependencies: diff --git a/patches/server-Fix_Leak/0001-server-Fix-newly-introduced-memory-leak-of-object-na.patch b/patches/server-Fix_Leak/0001-server-Fix-newly-introduced-memory-leak-of-object-na.patch deleted file mode 100644 index 16bf88ee..00000000 --- a/patches/server-Fix_Leak/0001-server-Fix-newly-introduced-memory-leak-of-object-na.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3d1d0332cc94bdac774643e1adfe987c534e088b Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Fri, 5 Feb 2016 19:07:42 +0100 -Subject: server: Fix newly introduced memory leak of object name structure. - ---- - server/object.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/server/object.c b/server/object.c -index c8098ca..b8be122 100644 ---- a/server/object.c -+++ b/server/object.c -@@ -222,6 +222,7 @@ void *create_object( struct object *parent, const struct object_ops *ops, const - if (!obj->ops->link_name( obj, name_ptr, parent )) - { - free_object( obj ); -+ free( name_ptr ); - return NULL; - } - name_ptr->obj = obj; --- -2.7.0 -