wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e776421232996729a0e350c31d56f696bd47e429.

Browse Source 
[server-Fix_Leak]
Removed patch to fix newly introduced memory leak of object name structure
(accepted upstream).
This commit is contained in:
Sebastian Lackner 2016-02-09 03:37:02 +01:00
parent 0e424c26ad
commit 31e5a4b2be
4 changed files with 14 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch
View File

@ -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?= <michael@fds-team.de>
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

12
patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch
View File

@ -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?= <michael@fds-team.de>
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

18
patches/patchinstall.sh
View File

@ -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:

24
patches/server-Fix_Leak/0001-server-Fix-newly-introduced-memory-leak-of-object-na.patch
View File

@ -1,24 +0,0 @@
From 3d1d0332cc94bdac774643e1adfe987c534e088b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
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