shell/Library_ooofilt.mk | 7 +++++++ shell/Library_ooofilt_x64.mk | 9 +++++++++ shell/Library_shlxthdl.mk | 9 +++++++++ shell/Library_shlxthdl_x64.mk | 9 +++++++++ shell/inc/internal/shellcomdllapi.h | 19 ------------------- shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 9 ++++----- shell/source/win32/shlxthandler/shlxthdl.cxx | 9 ++++----- 7 files changed, 42 insertions(+), 29 deletions(-)
New commits: commit 0438e851e8c33c856131f264d8c4722fe9cbc9ae Author: David Tardon <[email protected]> Date: Mon May 28 08:33:54 2012 +0200 export COM functions Change-Id: I5ab936c90b596716f92f04d0db46a77a656a758b diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 0abdd9b..30dd615 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -75,6 +75,13 @@ $(eval $(call gb_Library_use_libraries,ooofilt,\ )) 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,\ diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 270abfd..0e68d62 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -77,6 +77,15 @@ $(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 \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\ CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \ diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index 562bbf3..c183060 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -72,6 +72,15 @@ $(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 \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,shlxthdl,\ shell/source/win32/shlxthandler/classfactory \ shell/source/win32/shlxthandler/columninfo/columninfo \ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index 2affe1e..bbdcbde 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -78,6 +78,15 @@ $(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 \ +)) +endif + $(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\ CustomTarget/shell/source/win32/shlxthandler/classfactory \ CustomTarget/shell/source/win32/shlxthandler/columninfo/columninfo \ diff --git a/shell/source/win32/shlxthandler/exports.dxp b/shell/source/win32/shlxthandler/exports.dxp deleted file mode 100755 index 953039c..0000000 --- a/shell/source/win32/shlxthandler/exports.dxp +++ /dev/null @@ -1,4 +0,0 @@ -DllRegisterServer PRIVATE -DllUnregisterServer PRIVATE -DllGetClassObject PRIVATE -DllCanUnloadNow PRIVATE \ No newline at end of file diff --git a/shell/source/win32/shlxthandler/ooofilt/exports.dxp b/shell/source/win32/shlxthandler/ooofilt/exports.dxp deleted file mode 100755 index 953039c..0000000 --- a/shell/source/win32/shlxthandler/ooofilt/exports.dxp +++ /dev/null @@ -1,4 +0,0 @@ -DllRegisterServer PRIVATE -DllUnregisterServer PRIVATE -DllGetClassObject PRIVATE -DllCanUnloadNow PRIVATE \ No newline at end of file commit 697556a1e36580be34ac19b8e223000620d57fee Author: David Tardon <[email protected]> Date: Mon May 28 08:30:07 2012 +0200 Revert "export COM functions" This reverts commit e58b551534602de6e8f80f8ebdcdc0887c52f80e. diff --git a/shell/inc/internal/shellcomdllapi.h b/shell/inc/internal/shellcomdllapi.h deleted file mode 100644 index d9a9e16..0000000 --- a/shell/inc/internal/shellcomdllapi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Copyright 2012 LibreOffice contributors. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#if !defined SHELL_INTERNAL_SHELLCOMDLLAPI_H_INCLUDED -#define SHELL_INTERNAL_SHELLCOMDLLAPI_H_INCLUDED - -#include <sal/types.h> - -#define SHELL_COM_DLLPUBLIC SAL_DLLPUBLIC_EXPORT - -#endif /* SHELL_INTERNAL_SHELLCOMDLLAPI_H_INCLUDED */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/shlxthandler/exports.dxp b/shell/source/win32/shlxthandler/exports.dxp new file mode 100755 index 0000000..953039c --- /dev/null +++ b/shell/source/win32/shlxthandler/exports.dxp @@ -0,0 +1,4 @@ +DllRegisterServer PRIVATE +DllUnregisterServer PRIVATE +DllGetClassObject PRIVATE +DllCanUnloadNow PRIVATE \ No newline at end of file diff --git a/shell/source/win32/shlxthandler/ooofilt/exports.dxp b/shell/source/win32/shlxthandler/ooofilt/exports.dxp new file mode 100755 index 0000000..953039c --- /dev/null +++ b/shell/source/win32/shlxthandler/ooofilt/exports.dxp @@ -0,0 +1,4 @@ +DllRegisterServer PRIVATE +DllUnregisterServer PRIVATE +DllGetClassObject PRIVATE +DllCanUnloadNow PRIVATE \ No newline at end of file diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index ca5bbb7..7d6b15d 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -40,7 +40,6 @@ #include "internal/metainforeader.hxx" #include "internal/registry.hxx" #include "internal/fileextensions.hxx" -#include "internal/shellcomdllapi.h" //-------------------------------------------------------------------------- // Include file Purpose @@ -902,7 +901,7 @@ extern "C" BOOL WINAPI DllMain( // E_UNEXPECTED // Unsuccessful due to an unexpected condition //------------------------------------------------------------------------- -extern "C" SHELL_COM_DLLPUBLIC SCODE STDMETHODCALLTYPE DllGetClassObject( +extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject( REFCLSID cid, REFIID iid, void ** ppvObj @@ -942,7 +941,7 @@ extern "C" SHELL_COM_DLLPUBLIC SCODE STDMETHODCALLTYPE DllGetClassObject( // S_FALSE // DLL must remain loaded //-------------------------------------------------------------------------- -extern "C" SHELL_COM_DLLPUBLIC SCODE STDMETHODCALLTYPE DllCanUnloadNow() +extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow() { if ( 0 >= g_lInstances ) return S_OK; @@ -1253,14 +1252,14 @@ namespace /* private */ } // namespace /* private */ -SHELL_COM_DLLPUBLIC STDAPI DllRegisterServer() +STDAPI DllRegisterServer() { return S_OK; } //--------------------------- -SHELL_COM_DLLPUBLIC STDAPI DllUnregisterServer() +STDAPI DllUnregisterServer() { return S_OK; } diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 6b020a6..21257c7 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -28,7 +28,6 @@ #include "internal/config.hxx" #include "internal/global.hxx" -#include "internal/shellcomdllapi.h" #include "internal/shlxthdl.hxx" #include "classfactory.hxx" #include "internal/registry.hxx" @@ -312,7 +311,7 @@ namespace /* private */ // COM exports //--------------------- -extern "C" SHELL_COM_DLLPUBLIC STDAPI DllRegisterServer() +extern "C" STDAPI DllRegisterServer() { TCHAR ModuleFileName[MAX_PATH]; @@ -350,7 +349,7 @@ extern "C" SHELL_COM_DLLPUBLIC STDAPI DllRegisterServer() return hr; } -extern "C" SHELL_COM_DLLPUBLIC STDAPI DllUnregisterServer() +extern "C" STDAPI DllUnregisterServer() { HRESULT hr = S_OK; @@ -380,7 +379,7 @@ extern "C" SHELL_COM_DLLPUBLIC STDAPI DllUnregisterServer() return hr; } -extern "C" SHELL_COM_DLLPUBLIC STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) +extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) { *ppv = 0; @@ -410,7 +409,7 @@ extern "C" SHELL_COM_DLLPUBLIC STDAPI DllGetClassObject(REFCLSID rclsid, REFIID return S_OK; } -extern "C" SHELL_COM_DLLPUBLIC STDAPI DllCanUnloadNow(void) +extern "C" STDAPI DllCanUnloadNow(void) { if (CClassFactory::IsLocked() || g_DllRefCnt > 0) return S_FALSE; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
