From c1eea670208eda92072e4613f555df8a7d6e1333 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 23 Feb 2015 18:35:31 +0100
Subject: [PATCH] Added patch to mark DllCanUnloadNow and DllGetClassObject as
 private (by Amine Khaldi, wine-patched/pull/3).

---
 debian/changelog                              |  1 +
 ...nUnloadNow-and-DllGetClassObject-as-.patch | 24 +++++++++++
 patches/patchinstall.sh                       | 40 +++++++++++++------
 3 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 patches/d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch

diff --git a/debian/changelog b/debian/changelog
index f4818297..8e677d24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 wine-staging (1.7.38) UNRELEASED; urgency=low
   * Disabled patchset for reg.exe cleanup (partially accepted upstream).
+  * Added patch to mark DllCanUnloadNow and DllGetClassObject as private (by Amine Khaldi, wine-patched/pull/3).
  -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 23 Feb 2015 18:24:51 +0100
 
 wine-staging (1.7.37) unstable; urgency=low
diff --git a/patches/d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch b/patches/d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch
new file mode 100644
index 00000000..0cbae7c3
--- /dev/null
+++ b/patches/d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch
@@ -0,0 +1,24 @@
+From 348d1eafe2d80017509ebfb79832a7465fd1693b Mon Sep 17 00:00:00 2001
+From: Amine Khaldi <amine.khaldi@reactos.org>
+Date: Sun, 22 Feb 2015 22:39:25 +0100
+Subject: d3drm: Mark DllCanUnloadNow and DllGetClassObject as private.
+
+---
+ dlls/d3drm/d3drm.spec | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
+index 4108a72..e83fb0b 100644
+--- a/dlls/d3drm/d3drm.spec
++++ b/dlls/d3drm/d3drm.spec
+@@ -19,5 +19,5 @@
+ @ stdcall D3DRMVectorScale(ptr ptr float)
+ @ stdcall D3DRMVectorSubtract(ptr ptr ptr)
+ @ stdcall Direct3DRMCreate(ptr)
+-@ stub DllCanUnloadNow
+-@ stub DllGetClassObject
++@ stub -private DllCanUnloadNow
++@ stub -private DllGetClassObject
+-- 
+2.3.0
+
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index c5b5df53..fff38599 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -69,6 +69,7 @@ patch_enable_all ()
 	enable_comctl32_LoadIconMetric="$1"
 	enable_configure_Absolute_RPATH="$1"
 	enable_d3d9_Surface_Refcount="$1"
+	enable_d3drm_Specfile="$1"
 	enable_d3dx9_36_AnimationController="$1"
 	enable_d3dx9_36_ConvertToIndexedBlended="$1"
 	enable_d3dx9_36_D3DXStubs="$1"
@@ -238,6 +239,9 @@ patch_enable ()
 		d3d9-Surface_Refcount)
 			enable_d3d9_Surface_Refcount="$2"
 			;;
+		d3drm-Specfile)
+			enable_d3drm_Specfile="$2"
+			;;
 		d3dx9_36-AnimationController)
 			enable_d3dx9_36_AnimationController="$2"
 			;;
@@ -1202,6 +1206,18 @@ if test "$enable_d3d9_Surface_Refcount" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset d3drm-Specfile
+# |
+# | Modified files:
+# |   *	dlls/d3drm/d3drm.spec
+# |
+if test "$enable_d3drm_Specfile" -eq 1; then
+	patch_apply d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch
+	(
+		echo '+    { "Amine Khaldi", "d3drm: Mark DllCanUnloadNow and DllGetClassObject as private.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-DXTn
 # |
 # | This patchset fixes the following Wine bugs:
@@ -1491,18 +1507,6 @@ if test "$enable_dxgi_GetDesc" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset makedep-PARENTSPEC
-# |
-# | Modified files:
-# |   *	tools/makedep.c
-# |
-if test "$enable_makedep_PARENTSPEC" -eq 1; then
-	patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
-	(
-		echo '+    { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset ntdll-DllRedirects
 # |
 # | Modified files:
@@ -1523,6 +1527,18 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset makedep-PARENTSPEC
+# |
+# | Modified files:
+# |   *	tools/makedep.c
+# |
+if test "$enable_makedep_PARENTSPEC" -eq 1; then
+	patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
+	(
+		echo '+    { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-CSMT_Helper
 # |
 # | Modified files: