shell: export more symbols, as private

Change-Id: Ifca9712c2ee28c8e38925150b3e6d0f27195ff1d

11 files changed, 33 insertions, 53 deletions

diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 30dd6159c3ae..35e3662147e7 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -57,38 +57,31 @@ $(eval $(call gb_Library_use_libraries,ooofilt,\
 	advapi32 \
 	comctl32 \
 	kernel32 \
+	msvcprt \
 	ole32 \
 	shell32 \
 	uuid \
 	$(gb_Library_win32_OLDNAMES) \
 ))
 
-ifneq ($(COM),GCC)
-
-$(eval $(call gb_Library_use_libraries,ooofilt,\
-	msvcprt \
-))
-
 ifneq ($(PRODUCT),full)
 $(eval $(call gb_Library_use_libraries,ooofilt,\
 	msvcrt \
 ))
 endif
 
-$(eval $(call gb_Library_add_ldflags,ooofilt,\
-	/EXPORT:DllCanUnloadNow \
-	/EXPORT:DllGetClassObject \
-	/EXPORT:DllRegisterServer \
-	/EXPORT:DllUnregisterServer \
-))
-
-endif
-
 $(eval $(call gb_Library_use_static_libraries,ooofilt,\
 	shell_xmlparser \
 	shlxthandler_common \
 ))
 
+$(eval $(call gb_Library_add_ldflags,ooofilt,\
+	/EXPORT:DllCanUnloadNow,PRIVATE \
+	/EXPORT:DllGetClassObject,PRIVATE \
+	/EXPORT:DllRegisterServer,PRIVATE \
+	/EXPORT:DllUnregisterServer,PRIVATE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,ooofilt,\
     shell/source/win32/shlxthandler/ooofilt/ooofilt \
     shell/source/win32/shlxthandler/ooofilt/propspec \
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 0e68d6232258..ca779ff06b4b 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -77,14 +77,12 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\
 	shlxthandler_common_x64 \
 ))
 
-ifeq ($(COM),MSC)
 $(eval $(call gb_Library_add_ldflags,ooofilt_x64,\
-	/EXPORT:DllCanUnloadNow \
-	/EXPORT:DllGetClassObject \
-	/EXPORT:DllRegisterServer \
-	/EXPORT:DllUnregisterServer \
+	/EXPORT:DllCanUnloadNow,PRIVATE \
+	/EXPORT:DllGetClassObject,PRIVATE \
+	/EXPORT:DllRegisterServer,PRIVATE \
+	/EXPORT:DllUnregisterServer,PRIVATE \
 ))
-endif
 
 $(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\
     CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 250a53004516..8b7d7ff732b4 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,propertyhdl,\
 	gdi32 \
 	gdiplus \
 	kernel32 \
+	msvcprt \
 	ole32 \
 	oleaut32 \
 	propsys \
@@ -67,24 +68,16 @@ $(eval $(call gb_Library_use_libraries,propertyhdl,\
 	uuid \
 ))
 
-ifneq ($(COM),GCC)
-
-$(eval $(call gb_Library_use_libraries,propertyhdl,\
-	msvcprt \
-))
-
-ifneq ($(PRODUCT),full)
-$(eval $(call gb_Library_use_libraries,propertyhdl,\
-))
-endif
-
-endif
-
 $(eval $(call gb_Library_use_static_libraries,propertyhdl,\
 	shell_xmlparser \
 	shlxthandler_common \
 ))
 
+$(eval $(call gb_Library_add_ldflags,propertyhdl,\
+	/EXPORT:DllCanUnloadNow,PRIVATE \
+	/EXPORT:DllGetClassObject,PRIVATE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,propertyhdl,\
     shell/source/win32/shlxthandler/prophdl/propertyhdl \
 ))
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index af9fa2266101..c84738b92fa9 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -78,6 +78,11 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\
 	shlxthandler_common_x64 \
 ))
 
+$(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\
+	/EXPORT:DllCanUnloadNow,PRIVATE \
+	/EXPORT:DllGetClassObject,PRIVATE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\
     shell/source/win32/shlxthandler/prophdl/propertyhdl \
 ))
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 199cc8d771e3..c546db6101ff 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -73,14 +73,12 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl,\
 
 $(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl))
 
-ifeq ($(COM),MSC)
 $(eval $(call gb_Library_add_ldflags,shlxthdl,\
-	/EXPORT:DllCanUnloadNow \
-	/EXPORT:DllGetClassObject \
-	/EXPORT:DllRegisterServer \
-	/EXPORT:DllUnregisterServer \
+	/EXPORT:DllCanUnloadNow,PRIVATE \
+	/EXPORT:DllGetClassObject,PRIVATE \
+	/EXPORT:DllRegisterServer,PRIVATE \
+	/EXPORT:DllUnregisterServer,PRIVATE \
 ))
-endif
 
 $(eval $(call gb_Library_add_exception_objects,shlxthdl,\
     shell/source/win32/shlxthandler/classfactory \
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index 54111626919c..d1e2d984df1f 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -79,14 +79,12 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\
 
 $(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl))
 
-ifeq ($(COM),MSC)
 $(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\
-	/EXPORT:DllCanUnloadNow \
-	/EXPORT:DllGetClassObject \
-	/EXPORT:DllRegisterServer \
-	/EXPORT:DllUnregisterServer \
+	/EXPORT:DllCanUnloadNow,PRIVATE \
+	/EXPORT:DllGetClassObject,PRIVATE \
+	/EXPORT:DllRegisterServer,PRIVATE \
+	/EXPORT:DllUnregisterServer,PRIVATE \
 ))
-endif
 
 $(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\
     CustomTarget/shell/source/win32/shlxthandler/classfactory \
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 6e3c2425c411..124ed7083d25 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Module_add_targets,shell,\
 ))
 endif
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,shell,\
 	Executable_regsvrex \
@@ -77,7 +77,7 @@ $(eval $(call gb_Module_add_targets,shell,\
 	StaticLibrary_simplemapi \
 ))
 
-ifneq ($(COM),GCC)
+ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,shell,\
 	CustomTarget_shlxthdl_res \
 	Library_ooofilt \
diff --git a/shell/source/cmdmail/exports.dxp b/shell/source/cmdmail/exports.dxp
deleted file mode 100755
index 70033078921a..000000000000
--- a/shell/source/cmdmail/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/shell/source/win32/exports.dxp b/shell/source/win32/exports.dxp
deleted file mode 100755
index 70033078921a..000000000000
--- a/shell/source/win32/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/shell/source/win32/shlxthandler/prophdl/exports.dxp b/shell/source/win32/shlxthandler/prophdl/exports.dxp
deleted file mode 100755
index 2ada8255f8f7..000000000000
--- a/shell/source/win32/shlxthandler/prophdl/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-DllGetClassObject PRIVATE 
-DllCanUnloadNow PRIVATE
\ No newline at end of file
diff --git a/shell/source/win32/simplemail/exports.dxp b/shell/source/win32/simplemail/exports.dxp
deleted file mode 100755
index 70033078921a..000000000000
--- a/shell/source/win32/simplemail/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory