diff options
Diffstat (limited to 'embedserv/source/inprocserv')
| -rw-r--r-- | embedserv/source/inprocserv/dllentry.cxx | 13 | ||||
| -rw-r--r-- | embedserv/source/inprocserv/exports.dxp | 5 | ||||
| -rw-r--r-- | embedserv/source/inprocserv/makefile.mk | 80 |
3 files changed, 8 insertions, 90 deletions
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index b54c2c6e42db..ba6374658715 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -30,6 +30,9 @@ #include <inprocembobj.h> #ifdef __MINGW32__ #define INITGUID +#define INPROC_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define INPROC_DLLPUBLIC #endif #include <embservconst.h> @@ -167,7 +170,7 @@ protected: // =========================== // ------------------------------------------------------------------------------- -extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/ ) +extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/ ) { if (dwReason == DLL_PROCESS_ATTACH) { @@ -181,7 +184,7 @@ extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lp } // ------------------------------------------------------------------------------- -extern "C" STDAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) +extern "C" STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) { for( int nInd = 0; nInd < SUPPORTED_FACTORIES_NUM; nInd++ ) if ( *guidList[nInd] == rclsid ) @@ -201,7 +204,7 @@ extern "C" STDAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) } // ------------------------------------------------------------------------------- -extern "C" STDAPI DllCanUnloadNow() +extern "C" STDAPI INPROC_DLLPUBLIC DllCanUnloadNow() { if ( !g_nObj && !g_nLock ) return S_OK; @@ -210,7 +213,7 @@ extern "C" STDAPI DllCanUnloadNow() } // ------------------------------------------------------------------------------- -STDAPI DllRegisterServer( void ) +STDAPI INPROC_DLLPUBLIC DllRegisterServer( void ) { char aLibPath[1024]; HMODULE aCurModule = GetModuleHandleA( "inprocserv.dll" ); @@ -228,7 +231,7 @@ STDAPI DllRegisterServer( void ) } // ------------------------------------------------------------------------------- -STDAPI DllUnregisterServer( void ) +STDAPI INPROC_DLLPUBLIC DllUnregisterServer( void ) { return WriteLibraryToRegistry( "ole32.dll", 10 ); } diff --git a/embedserv/source/inprocserv/exports.dxp b/embedserv/source/inprocserv/exports.dxp deleted file mode 100644 index 65a5126f162e..000000000000 --- a/embedserv/source/inprocserv/exports.dxp +++ /dev/null @@ -1,5 +0,0 @@ -DllGetClassObject -DllCanUnloadNow -DllMain -DllRegisterServer -DllUnregisterServer diff --git a/embedserv/source/inprocserv/makefile.mk b/embedserv/source/inprocserv/makefile.mk deleted file mode 100644 index 024e0f9d4ee3..000000000000 --- a/embedserv/source/inprocserv/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=embedserv -TARGET=inprocserv - -use_shl_versions= - -# --- Settings ---------------------------------- -.INCLUDE : settings.mk - -.IF "$(GUI)" == "WNT" - -LIBTARGET=NO -USE_DEFFILE=YES -LIBCMT=libcmt.lib -UWINAPILIB= - -# --- Files ------------------------------------- - -SLOFILES=\ - $(SLO)$/dllentry.obj \ - $(SLO)$/advisesink.obj \ - $(SLO)$/inprocembobj.obj - -SHL1TARGET=$(TARGET) -.IF "$(COM)"=="GCC" -SHL1STDLIBS += -lstdc++ -.IF "$(MINGW_GCCLIB_EH)"=="YES" -SHL1STDLIBS += -lgcc_eh -.ENDIF -SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt -.ELSE -SHL1STDLIBS= -.ENDIF - -SHL1STDLIBS+=\ - $(UUIDLIB)\ - $(OLE32LIB)\ - $(GDI32LIB)\ - $(ADVAPI32LIB) - -SHL1OBJS=$(SLOFILES) - -SHL1DEF=$(MISC)$/$(TARGET).def - -DEF1NAME= $(TARGET) -DEF1EXPORTFILE= exports.dxp - -.ENDIF - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - |