summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-10 14:05:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-10 18:01:27 +0000
commit8646ab97dc37c0606b19057686bf3d610f9c15ee (patch)
tree17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /vcl
parent09e9274fc080b471393b806617eb03124db67590 (diff)
Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with MinGW. Later, in LO times, this has been shifted to an attempt of cross- compiling for Windows on Linux. That attempt can be considered abandoned, and the relevant code rotting. Due to this heritage, there are now three kinds of MinGW-specific code in LO: * Code from the original OOo native Windows effort that is no longer relevant for the LO cross-compilation effort, but has never been removed properly. * Code from the original OOo native Windows effort that is re-purposed for the LO cross-compilation effort. * Code that has been added specifially for the LO cross-compilation effort. All three kinds of code are removed. (An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing --with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.) Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568 Reviewed-on: https://gerrit.libreoffice.org/34127 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Library_vcl.mk1
-rw-r--r--vcl/source/edit/texteng.cxx2
-rw-r--r--vcl/source/gdi/sallayout.cxx2
-rw-r--r--vcl/win/app/salinst.cxx32
-rw-r--r--vcl/win/app/saltimer.cxx19
-rw-r--r--vcl/win/gdi/gdiimpl.cxx11
-rw-r--r--vcl/win/gdi/salprn.cxx20
-rw-r--r--vcl/win/window/salframe.cxx20
8 files changed, 2 insertions, 105 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e8277dc78f95..3132d9e181b5 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precom
$(eval $(call gb_Library_set_include,vcl,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
- $(if $(filter WNTGCC,$(OS)$(COM)),-I$(MINGW_SYSROOT)/include/gdiplus) \
))
$(eval $(call gb_Library_add_defs,vcl,\
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index c3c3c8561973..69caafdfa73e 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -2836,7 +2836,7 @@ void TextEngine::ImpInitWritingDirections( sal_uInt32 nPara )
UBiDi* pBidi = ubidi_openSized( aText.getLength(), 0, &nError );
nError = U_ZERO_ERROR;
- ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.getStr()), aText.getLength(), nBidiLevel, nullptr, &nError ); // UChar != sal_Unicode in MinGW
+ ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.getStr()), aText.getLength(), nBidiLevel, nullptr, &nError );
nError = U_ZERO_ERROR;
long nCount = ubidi_countRuns( pBidi, &nError );
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 79b3140dd6f1..88f02d66f6fa 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -441,7 +441,7 @@ ImplLayoutArgs::ImplLayoutArgs(const OUString& rStr,
UBiDi* pParaBidi = ubidi_openSized(nLength, 0, &rcI18n);
if( !pParaBidi )
return;
- ubidi_setPara(pParaBidi, reinterpret_cast<const UChar *>(mrStr.getStr()), nLength, nLevel, nullptr, &rcI18n); // UChar != sal_Unicode in MinGW
+ ubidi_setPara(pParaBidi, reinterpret_cast<const UChar *>(mrStr.getStr()), nLength, nLevel, nullptr, &rcI18n);
UBiDi* pLineBidi = pParaBidi;
int nSubLength = mnEndCharPos - mnMinCharPos;
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 0d00e4719872..4f270bc7845f 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -59,13 +59,6 @@
#pragma warning( disable: 4917 )
#endif
-#ifdef __MINGW32__
-#ifdef GetObject
-#undef GetObject
-#endif
-#define GetObject GetObjectA
-#endif
-
#include "prewin.h"
#include <gdiplus.h>
@@ -76,20 +69,10 @@
#endif
#include "postwin.h"
-#ifdef __MINGW32__
-#ifdef GetObject
-#undef GetObject
-#endif
-#endif
-
#if defined _MSC_VER
#pragma warning(pop)
#endif
-#ifdef __MINGW32__
-#include <sehandler.hxx>
-#endif
-
void SalAbort( const OUString& rErrorText, bool )
{
ImplFreeSalGDI();
@@ -756,25 +739,13 @@ LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa
{
int bDef = TRUE;
LRESULT nRet = 0;
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- jmp_buf jmpbuf;
- __SEHandler han;
- if (__builtin_setjmp(jmpbuf) == 0)
- {
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
__try
{
-#endif
nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef );
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- han.Reset();
-#else
__except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation()))
{
}
-#endif
if ( bDef )
{
if ( !ImplHandleGlobalMsg( hWnd, nMsg, wParam, lParam, nRet ) )
@@ -1031,8 +1002,6 @@ SalSession* WinSalInstance::CreateSalSession()
return nullptr;
}
-#if !defined ( __MINGW32__ ) || defined ( _WIN64 )
-
int WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(int, LPEXCEPTION_POINTERS pExceptionInfo)
{
// Decide if an exception is a c++ (mostly UNO) exception or a process violation.
@@ -1048,7 +1017,6 @@ int WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(int, LPEXCEPTION_POIN
return UnhandledExceptionFilter( pExceptionInfo );
}
-#endif
OUString WinSalInstance::getOSVersion()
{
diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index 7930ac9e0b6c..8a21780e6d1e 100644
--- a/vcl/win/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
@@ -22,10 +22,6 @@
#include <win/saltimer.h>
#include <win/salinst.h>
-#if defined ( __MINGW32__ )
-#include <sehandler.hxx>
-#endif
-
// maximum period
#define MAX_SYSPERIOD 65533
@@ -119,17 +115,8 @@ at better resolution than 10ms.
*/
void CALLBACK SalTimerProc(PVOID, BOOLEAN)
{
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- jmp_buf jmpbuf;
- __SEHandler han;
- if (__builtin_setjmp(jmpbuf) == 0)
- {
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
__try
{
-#endif
-
SalData* pSalData = GetSalData();
// always post message when the timer fires, we will remove the ones
@@ -140,16 +127,10 @@ void CALLBACK SalTimerProc(PVOID, BOOLEAN)
if (0 == ret) // SEH prevents using SAL_WARN here?
fputs("ERROR: PostMessage() failed!", stderr);
#endif
-
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- }
- han.Reset();
-#else
}
__except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation()))
{
}
-#endif
}
/** Called in the main thread.
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 250c2c84103e..277b1d85b94e 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -51,12 +51,6 @@
#include "prewin.h"
-#ifdef __MINGW32__
-#ifdef GetObject
-#undef GetObject
-#endif
-#endif
-
#include <gdiplus.h>
#include <gdiplusenums.h>
#include <gdipluscolor.h>
@@ -2166,12 +2160,7 @@ void setInterpolationMode(
if(bSameWidth && bSameHeight)
{
-#ifdef __MINGW32__
- //Gdiplus::InterpolationModeInvalid is missing on mingw
- rGraphics.SetInterpolationMode(Gdiplus::InterpolationModeDefault);
-#else
rGraphics.SetInterpolationMode(Gdiplus::InterpolationModeInvalid);
-#endif
}
else if(rDestWidth > rSrcWidth && rDestHeight > rSrcHeight)
{
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index f2f25d654d35..63c0c24ba810 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -49,25 +49,6 @@
#include <malloc.h>
-#if defined ( __MINGW32__ )
-#include <sehandler.hxx>
-#endif
-
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
-#define CATCH_DRIVER_EX_BEGIN \
- jmp_buf jmpbuf; \
- __SEHandler han; \
- if (__builtin_setjmp(jmpbuf) == 0) \
- { \
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER)
-
-#define CATCH_DRIVER_EX_END(mes, p) \
- } \
- han.Reset()
-#define CATCH_DRIVER_EX_END_2(mes) \
- } \
- han.Reset()
-#else
#define CATCH_DRIVER_EX_BEGIN \
__try \
{
@@ -84,7 +65,6 @@
{ \
OSL_FAIL( mes ); \
}
-#endif
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 85339ff0e905..88e6f814b155 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -77,10 +77,6 @@
#include <multimon.h>
#pragma warning(pop)
#include <vector>
-#ifdef __MINGW32__
-#include <algorithm>
-using ::std::max;
-#endif
#include <com/sun/star/uno/Exception.hpp>
@@ -92,10 +88,6 @@ using ::std::max;
#include <time.h>
-#if defined ( __MINGW32__ )
-#include <sehandler.hxx>
-#endif
-
#include <windows.h>
#include <shobjidl.h>
#include <propkey.h>
@@ -5886,25 +5878,13 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l
{
int bDef = TRUE;
LRESULT nRet = 0;
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- jmp_buf jmpbuf;
- __SEHandler han;
- if (__builtin_setjmp(jmpbuf) == 0)
- {
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
__try
{
-#endif
nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef );
}
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- han.Reset();
-#else
__except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation()))
{
}
-#endif
if ( bDef )
nRet = DefWindowProcW( hWnd, nMsg, wParam, lParam );