mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No idea why this would need to be an archaic LibMain

Browse Source 
Change-Id: I4a41a2975f670b06159de5c94ab9a66ab204c725
This commit is contained in:
Stephan Bergmann
2014-12-08 17:59:03 +01:00
parent af64f43018
commit 322ca1cea2
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vcl/Library_vcl.mk
View File

@@ -694,14 +694,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\
)) ))
$(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc)) $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc))
ifeq ($(COM),MSC)
ifeq ($(USE_MINGW),)
$(eval $(call gb_Library_add_ldflags,vcl,\
/ENTRY:LibMain@12 \
))
endif
endif
endif endif
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)

21
vcl/win/source/app/salshl.cxx
View File

@@ -23,32 +23,13 @@
SalShlData aSalShlData; SalShlData aSalShlData;
extern "C" extern "C" BOOL WINAPI DllMain(HINSTANCE hInst, DWORD nReason, LPVOID)
{ {
#ifdef __MINGW32__
bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
#else
BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved );
BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
#endif
{
// Unsere DLL-Initialisierung
if ( nReason == DLL_PROCESS_ATTACH ) if ( nReason == DLL_PROCESS_ATTACH )
aSalShlData.mhInst = hInst; aSalShlData.mhInst = hInst;
#ifndef __MINGW32__
if ( !_CRT_INIT( hInst, nReason, pReserved ) )
return 0;
#else
(void)pReserved;
#endif
return 1; return 1;
} }
}
HCURSOR ImplLoadSalCursor( int nId ) HCURSOR ImplLoadSalCursor( int nId )
{ {
DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" ); DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" );