Attachment #12598 for issue #24588

View | Details | Raw Unified | Return to issue 24588
Collapse All | Expand All

Lines 1-8 Link Here

(-)./pyuno/prj/d.lst.orig (+3 lines)
1	..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so	1	..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so
		2	..\%__SRC%\lib\libpyuno.a %_DEST%\lib%_EXT%\libpyuno.a
2	..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib	3	..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib
3	..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so	4	..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so
		5	..\%__SRC%\lib\pyuno.a %_DEST%\lib%_EXT%\pyuno.a
4	..\%__SRC%\lib\pyuno.dylib %_DEST%\lib%_EXT%\pyuno.dylib	6	..\%__SRC%\lib\pyuno.dylib %_DEST%\lib%_EXT%\pyuno.dylib
5	..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so	7	..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so
		8	..\%__SRC%\lib\pythonloader.uno.a %_DEST%\lib%_EXT%\pythonloader.uno.a
6	..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib	9	..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib
7	..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\unohelper.py	10	..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\unohelper.py
8	..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pythonloader.py	11	..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pythonloader.py

Lines 53-58 Link Here

(-)./python/prj/d.lst.orig (+6 lines)
53	..\%__SRC%\lib\libpython.so.2.2.2 %_DEST%\lib%_EXT%\libpython.so.2.2.2	53	..\%__SRC%\lib\libpython.so.2.2.2 %_DEST%\lib%_EXT%\libpython.so.2.2.2
54	..\%__SRC%\lib\libpython.dylib %_DEST%\lib%_EXT%\libpython.dylib	54	..\%__SRC%\lib\libpython.dylib %_DEST%\lib%_EXT%\libpython.dylib
55		55
		56	#MingW ONLY !
		57	..\%__SRC%\misc\build\python-inst\include\python22\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
		58	..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
		59	..\%__SRC%\bin\python22.dll %_DEST%\bin%_EXT%\python22.dll
		60	..\%__SRC%\misc\build\Python-2.2.2\libpython22.dll.a %_DEST%\lib%_EXT%\libpython.a
		61
56	# WINDOWS ONLY !	62	# WINDOWS ONLY !
57	..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h	63	..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
58	..\%__SRC%\misc\build\Python-2.2.2\PCBuild\python.exe %_DEST%\bin%_EXT%\python.exe	64	..\%__SRC%\misc\build\Python-2.2.2\PCBuild\python.exe %_DEST%\bin%_EXT%\python.exe

Lines 1-158 Link Here

(-)./python/Python-2.2.2.patch.orig (-1 lines)
1	*** misc/Python-2.2.2/Makefile.pre.in Fri Aug 23 18:05:49 2002

Lines 206-242 Link Here

(-)- misc/build/Python-2.2.2/configure (-1 lines)
206	#else	51	#else
207	#ifndef HAVE_GETTIMEOFDAY	52	#ifndef HAVE_GETTIMEOFDAY
208	#error "This module requires gettimeofday() on non-Windows platforms!"	53	#error "This module requires gettimeofday() on non-Windows platforms!"
209	*** misc/Python-2.2.2/Modules/posixmodule.c Fri Aug 23 18:27:40 2002

Lines 1839-1841 Link Here

(-)./crashrep/source/win32/soreport.cpp.orig (+43 lines)
1839	}	1653	}
1840	#endif /* USE_DYLD */	1654	#endif /* USE_DYLD */
1841		1655
		1656	--- misc/build/Python-2.2.2/Makefile.pre.in.orig 2002-08-24 01:05:50.000000000 +0900
Lines 53-58 Link Here
53	#define MAX_TEXT_BUFFER (32*1024-1)	53	#define MAX_TEXT_BUFFER (32*1024-1)
54	#define MAX_HOSTNAME (1024)	54	#define MAX_HOSTNAME (1024)
55		55
		56	#ifdef __MINGW32__
		57	#define PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS
		58	#define PPROCESS_INFORMATION LPPROCESS_INFORMATION
		59	#endif
56	#include <dbghelp.h>	60	#include <dbghelp.h>
57		61
58	using namespace ::std;	62	using namespace ::std;
Lines 1537-1543 Link Here
1537	static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId )	1541	static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId )
1538	{	1542	{
1539	int argc = __argc;	1543	int argc = __argc;
		1544	#ifdef __MINGW32__
		1545	#ifdef _UNICODE
		1546	TCHAR *argv = alloca((argc+1)sizeof(WCHAR*));
		1547	int sizes = alloca(argcsizeof(int));
		1548	int argsize=0;
		1549	char **ptr;
		1550	int i;
		1551	ptr=__argv;
		1552	for (i = 0; i < argc; ++i)
		1553	{
		1554	sizes[i]=MultiByteToWideChar(CP_ACP, 0, *ptr, -1, NULL, 0);
		1555	argsize+=sizes[i]+1;
		1556	++ptr;
		1557	}
		1558	++argsize;
		1559	TCHAR args = alloca(argsizesizeof(WCHAR));
		1560	ptr=__argv;
		1561	TCHAR *cptr=args;
		1562	for (i = 0; i < argc; ++i)
		1563	{
		1564	argv[i]=cptr;
		1565	MultiByteToWideChar( CP_ACP, 0, *ptr, -1, cptr, sizes[i] );
		1566	++ptr;
		1567	cptr+=sizes[i];
		1568	*cptr=0;
		1569	++cptr;
		1570	}
		1571	argv[i]=cptr;
		1572	*cptr=0;
		1573	#else
		1574	TCHAR **argv = __argv;
		1575	#endif
		1576	#else
1540	TCHAR **argv = __targv;	1577	TCHAR **argv = __targv;
		1578	#endif
1541	bool bSuccess = true;	1579	bool bSuccess = true;
1542		1580
1543	for ( int argn = 1; bSuccess && argn < argc; argn++ )	1581	for ( int argn = 1; bSuccess && argn < argc; argn++ )
Lines 2237-2243 Link Here
2237		2275
2238	//***************************************************************************	2276	//***************************************************************************
2239		2277
		2278	#ifdef __MINGW32__
		2279	int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR lpCmdLine, int )
		2280	#else
2240	int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR lpCmdLine, int )	2281	int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR lpCmdLine, int )
		2282	#endif
2241	{	2283	{
2242	int exitcode = -1;	2284	int exitcode = -1;
2243		2285

Lines 1-4 Link Here

(-)./crashrep/source/win32/rcheader.txt.orig (+4 lines)
1	// Header	1	// Header
2	#include "resource.h"	2	#include "resource.h"
3	#include "winres.h"	3	#include "winres.h"
		4	#ifdef __MINGW32__
		5	#define TCS_MULTISELECT 4
		6	#define TCS_VERTICAL 0x80
		7	#endif
4		8

Lines 4-9 Link Here

(-)./regexp/prj/d.lst.orig (+1 lines)
4		4
5	..\%__SRC%\bin\i18nregexp.dll %_DEST%\bin%_EXT%\i18nregexp.dll	5	..\%__SRC%\bin\i18nregexp.dll %_DEST%\bin%_EXT%\i18nregexp.dll
6	..\%__SRC%\lib\libi18nregexp.so %_DEST%\lib%_EXT%\libi18nregexp.so	6	..\%__SRC%\lib\libi18nregexp.so %_DEST%\lib%_EXT%\libi18nregexp.so
		7	..\%__SRC%\lib\libi18nregexp.a %_DEST%\lib%_EXT%\libi18nregexp.a
7	..\%__SRC%\lib\libi18nregexp.dylib %_DEST%\lib%_EXT%\libi18nregexp.dylib	8	..\%__SRC%\lib\libi18nregexp.dylib %_DEST%\lib%_EXT%\libi18nregexp.dylib
8	..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib%_EXT%\ii18nregexp.lib	9	..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib%_EXT%\ii18nregexp.lib
9		10

Lines 10-15 Link Here

(-)./i18nutil/prj/d.lst.orig (+1 lines)
10	..\%__SRC%\bin\i18nutil.dll %_DEST%\bin%_EXT%\i18nutil.dll	10	..\%__SRC%\bin\i18nutil.dll %_DEST%\bin%_EXT%\i18nutil.dll
11	..\%__SRC%\lib\libi18nutil.so %_DEST%\lib%_EXT%\libi18nutil.so	11	..\%__SRC%\lib\libi18nutil.so %_DEST%\lib%_EXT%\libi18nutil.so
12	..\%__SRC%\lib\libi18nutil.dylib %_DEST%\lib%_EXT%\libi18nutil.dylib	12	..\%__SRC%\lib\libi18nutil.dylib %_DEST%\lib%_EXT%\libi18nutil.dylib
		13	..\%__SRC%\lib\libi18nutil.a %_DEST%\lib%_EXT%\libi18nutil.a
13	..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib	14	..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib
14		15
15	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib	16	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib

Lines 62-69 Link Here

(-)./embedserv/source/inc/common.h.orig (-1 / +71 lines)
62	#ifndef _COMMON_H_	62	#ifndef _COMMON_H_
63	#define _COMMON_H_	63	#define _COMMON_H_
64		64
		65	#ifdef __MINGW32__
		66	#include <windows.h>
		67	#include <tchar.h>
		68	#include <basetyps.h>
		69	#else
65	#include "stdafx.h"	70	#include "stdafx.h"
66	#include <initguid.h>	71	#include <initguid.h>
		72	#endif
67		73
68	#ifndef _RTL_USTRING_HXX_	74	#ifndef _RTL_USTRING_HXX_
69	#include <rtl/ustring.hxx>	75	#include <rtl/ustring.hxx>
Lines 91-96 Link Here
91		97
92	const sal_Int32 nConstBufferSize = 32000;	98	const sal_Int32 nConstBufferSize = 32000;
93		99
		100	#ifdef __MINGW32__
		101	template<class T>
		102	class XWindowsComPtr
		103	{
		104	public:
		105	XWindowsComPtr()
		106	{
		107	p=NULL;
		108	}
		109	~XWindowsComPtr()
		110	{
		111	if (p)
		112	p->Release();
		113	}
		114	XWindowsComPtr(const XWindowsComPtr<T>& lp)
		115	{
		116	if ((p = lp.p) != NULL)
		117	p->AddRef();
		118	}
		119	T* operator=(const XWindowsComPtr<T>& lp)
		120	{
		121	return assign(lp.p);
		122	}
		123	T* operator=(T* lp)
		124	{
		125	return assign(lp);
		126	}
		127	bool operator!() const
		128	{
		129	return (p == NULL);
		130	}
		131	operator T*() const
		132	{
		133	return p;
		134	}
		135	T* operator->() const
		136	{
		137	return p;
		138	}
		139	T** operator&()
		140	{
		141	return &p;
		142	}
		143	private:
		144	T* assign(T* lp)
		145	{
		146	if (lp != NULL)
		147	lp->AddRef();
		148	if (p)
		149	p->Release();
		150	return p = lp;
		151	}
		152	XWindowsComPtr(T* lp)
		153	{
		154	if ((p = lp) != NULL)
		155	p->AddRef();
		156	}
		157	bool operator==(T* pT) const
		158	{
		159	return p == pT;
		160	}
		161	T* p;
		162	};
		163	#endif
164
94	#define SUPPORTED_FACTORIES_NUM 5	165	#define SUPPORTED_FACTORIES_NUM 5
95		166
96	// {30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}	167	// {30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}
Lines 114-119 Link Here
114	// {D0484DE6-AAEE-468a-991F-8D4B0737B57A}	185	// {D0484DE6-AAEE-468a-991F-8D4B0737B57A}
115	DEFINE_GUID(OID_MathServer, 0xd0484de6, 0xaaee, 0x468a, 0x99, 0x1f, 0x8d, 0x4b, 0x7, 0x37, 0xb5, 0x7a );	186	DEFINE_GUID(OID_MathServer, 0xd0484de6, 0xaaee, 0x468a, 0x99, 0x1f, 0x8d, 0x4b, 0x7, 0x37, 0xb5, 0x7a );
116		187
117
118	#endif	188	#endif
119		189





	::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > DocumentFrame();

#ifdef __MINGW32__
	XWindowsComPtr< IDispatch > m_pIDispatch;
#else
	CComPtr< IDispatch > m_pIDispatch;
#endif

public:


	::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetDocument() { return m_xDocument; }
	
// XEventListener
	virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aSource )
		throw( ::com::sun::star::uno::RuntimeException );

// XCloseListener
	virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aSource, sal_Bool bGetsOwnership )
		throw( ::com::sun::star::util::CloseVetoException );
	
	virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aSource )
		throw( ::com::sun::star::uno::RuntimeException );

// XTerminateListener
	virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& aSource )
		throw( ::com::sun::star::frame::TerminationVetoException );

	virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& aSource )
		throw( ::com::sun::star::uno::RuntimeException );

// XModifyListener
	virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);

Lines 217-223 Link Here

(-)./embedserv/source/inc/intercept.hxx.orig (-1 / +1 lines)
217	::com::sun::star::uno::Reference<	217	::com::sun::star::uno::Reference<
218	::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider;	218	::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider;
219		219
220	static ::com::sun::star::uno::Sequence<::rtl::OUString>	220	static ::com::sun::star::uno::Sequence< ::rtl::OUString >
221	m_aInterceptedURL;	221	m_aInterceptedURL;
222		222
223	cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;	223	cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;

Lines 182-196 Link Here

(-)./embedserv/source/inc/embeddoc.hxx.orig (+11 lines)
182	DocumentHolder* m_pDocHolder;	182	DocumentHolder* m_pDocHolder;
183	::rtl::OUString m_aFileName;	183	::rtl::OUString m_aFileName;
184		184
		185	#ifdef __MINGW32__
		186	XWindowsComPtr< IStorage > m_pMasterStorage;
		187	XWindowsComPtr< IStream > m_pOwnStream;
		188	XWindowsComPtr< IStream > m_pExtStream;
		189	#else
185	CComPtr< IStorage > m_pMasterStorage;	190	CComPtr< IStorage > m_pMasterStorage;
186	CComPtr< IStream > m_pOwnStream;	191	CComPtr< IStream > m_pOwnStream;
187	CComPtr< IStream > m_pExtStream;	192	CComPtr< IStream > m_pExtStream;
		193	#endif
188	GUID m_guid;	194	GUID m_guid;
189		195
190	sal_Bool m_bIsDirty;	196	sal_Bool m_bIsDirty;
191		197
		198	#ifdef __MINGW32__
		199	XWindowsComPtr< IOleClientSite > m_pClientSite;
		200	XWindowsComPtr< IDataAdviseHolder > m_pDAdviseHolder;
		201	#else
192	CComPtr< IOleClientSite > m_pClientSite;	202	CComPtr< IOleClientSite > m_pClientSite;
193	CComPtr< IDataAdviseHolder > m_pDAdviseHolder;	203	CComPtr< IDataAdviseHolder > m_pDAdviseHolder;
		204	#endif
194		205
195	AdviseSinkHashMap m_aAdviseHashMap;	206	AdviseSinkHashMap m_aAdviseHashMap;
196	DWORD m_nAdviseNum;	207	DWORD m_nAdviseNum;




class EmbedServer_Impl : public ::cppu::OWeakObject, ::com::sun::star::lang::XTypeProvider
{
public:
	EmbedServer_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &xFactory );
	~EmbedServer_Impl();

	// XInterface
    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 
		throw(::com::sun::star::uno::RuntimeException);
    virtual void SAL_CALL acquire() throw ();
    virtual void SAL_CALL release() throw ();

	// XTypeProvider
    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 


protected:

#ifdef __MINGW32__
	XWindowsComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ];
#else
	CComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ];
#endif
	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
};

class EmbedProviderFactory_Impl : public IClassFactory
{
public:

	EmbedProviderFactory_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const GUID* pGuid);
	~EmbedProviderFactory_Impl();

	sal_Bool registerClass();

	GUID				m_guid;
	DWORD 				m_factoryHandle;

	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
};

#endif

Lines 191-197 Link Here

(-)./embedserv/source/embed/ed_idataobj.cxx.orig (+4 lines)
191	if ( !( pFormatetc->tymed & TYMED_ISTORAGE ) )	191	if ( !( pFormatetc->tymed & TYMED_ISTORAGE ) )
192	return DV_E_TYMED;	192	return DV_E_TYMED;
193		193
		194	#ifdef __MINGW32__
		195	XWindowsComPtr< IStorage > pNewStg;
		196	#else
194	CComPtr< IStorage > pNewStg;	197	CComPtr< IStorage > pNewStg;
		198	#endif
195	HRESULT hr = StgCreateDocfile( NULL, STGM_CREATE \| STGM_READWRITE \| STGM_DELETEONRELEASE, 0, &pNewStg );	199	HRESULT hr = StgCreateDocfile( NULL, STGM_CREATE \| STGM_READWRITE \| STGM_DELETEONRELEASE, 0, &pNewStg );
196	if ( FAILED( hr ) \|\| !pNewStg ) return STG_E_MEDIUMFULL;	200	if ( FAILED( hr ) \|\| !pNewStg ) return STG_E_MEDIUMFULL;
197		201

Lines 282-289 Link Here

(-)./embedserv/source/embed/ed_ipersiststr.cxx.orig (+104 lines)
282	{	282	{
283	util::URL aURL;	283	util::URL aURL;
284		284
		285	#ifdef __MINGW32__
		286	aURL.Complete = ::rtl::OUString( reinterpret_cast<const sal_Unicode * >( pFilePath ) );
		287	#else
285	USES_CONVERSION;	288	USES_CONVERSION;
286	aURL.Complete = ::rtl::OUString( OLE2CW( pFilePath ) );	289	aURL.Complete = ::rtl::OUString( OLE2CW( pFilePath ) );
		290	#endif
287		291
288	if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) )	292	if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) )
289	sDocUrl = aURL.Complete;	293	sDocUrl = aURL.Complete;
Lines 319-326 Link Here
319		323
320	// for saveto operation the master storage	324	// for saveto operation the master storage
321	// should not enter NoScribble mode	325	// should not enter NoScribble mode
		326	#ifdef __MINGW32__
		327	XWindowsComPtr< IStream > pOrigOwn = m_pOwnStream;
		328	XWindowsComPtr< IStream > pOrigExt = m_pExtStream;
		329	#else
322	CComPtr< IStream > pOrigOwn = m_pOwnStream;	330	CComPtr< IStream > pOrigOwn = m_pOwnStream;
323	CComPtr< IStream > pOrigExt = m_pExtStream;	331	CComPtr< IStream > pOrigExt = m_pExtStream;
		332	#endif
324	HRESULT hr = Save( pStg, sal_False );	333	HRESULT hr = Save( pStg, sal_False );
325	m_pOwnStream = pOrigOwn;	334	m_pOwnStream = pOrigOwn;
326	m_pExtStream = pOrigExt;	335	m_pExtStream = pOrigExt;
Lines 457-467 Link Here
457	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );	466	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );
458	hr = WriteFmtUserTypeStg( pStg,	467	hr = WriteFmtUserTypeStg( pStg,
459	cf, // ???	468	cf, // ???
		469	#ifdef __MINGW32__
		470	reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) );
		471	#else
460	( sal_Unicode* )aCurType.getStr() );	472	( sal_Unicode* )aCurType.getStr() );
		473	#endif
461		474
462	if ( hr == S_OK )	475	if ( hr == S_OK )
463	{	476	{
		477	#ifdef __MINGW32__
		478	hr = pStg->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		479	#else
464	hr = pStg->CreateStream( aOfficeEmbedStreamName,	480	hr = pStg->CreateStream( aOfficeEmbedStreamName,
		481	#endif
465	STGM_CREATE \| ( nStreamMode & 0x73 ),	482	STGM_CREATE \| ( nStreamMode & 0x73 ),
466	0,	483	0,
467	0,	484	0,
Lines 469-475 Link Here
469		486
470	if ( hr == S_OK && m_pOwnStream )	487	if ( hr == S_OK && m_pOwnStream )
471	{	488	{
		489	#ifdef __MINGW32__
		490	hr = pStg->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		491	#else
472	hr = pStg->CreateStream( aExtentStreamName,	492	hr = pStg->CreateStream( aExtentStreamName,
		493	#endif
473	STGM_CREATE \| ( nStreamMode & 0x73 ),	494	STGM_CREATE \| ( nStreamMode & 0x73 ),
474	0,	495	0,
475	0,	496	0,
Lines 515-521 Link Here
515	if ( FAILED( hr ) ) return E_FAIL;	536	if ( FAILED( hr ) ) return E_FAIL;
516		537
517	DWORD nStreamMode = aStat.grfMode;	538	DWORD nStreamMode = aStat.grfMode;
		539	#ifdef __MINGW32__
		540	hr = pStg->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		541	#else
518	hr = pStg->OpenStream( aOfficeEmbedStreamName,	542	hr = pStg->OpenStream( aOfficeEmbedStreamName,
		543	#endif
519	0,	544	0,
520	nStreamMode & 0x73,	545	nStreamMode & 0x73,
521	0,	546	0,
Lines 524-530 Link Here
524		549
525	if ( SUCCEEDED( hr ) )	550	if ( SUCCEEDED( hr ) )
526	{	551	{
		552	#ifdef __MINGW32__
		553	hr = pStg->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		554	#else
527	hr = pStg->OpenStream( aExtentStreamName,	555	hr = pStg->OpenStream( aExtentStreamName,
		556	#endif
528	0,	557	0,
529	nStreamMode & 0x73,	558	nStreamMode & 0x73,
530	0,	559	0,
Lines 591-600 Link Here
591		620
592	if ( FAILED( hr ) )	621	if ( FAILED( hr ) )
593	{	622	{
		623	#ifdef __MINGW32__
		624	m_pOwnStream = XWindowsComPtr< IStream >();
		625	m_pExtStream = XWindowsComPtr< IStream >();
		626	hr = pStg->DestroyElement( reinterpret_cast< const wchar_t * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ) );
		627	hr = pStg->DestroyElement( reinterpret_cast< const wchar_t * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ) );
		628	#else
594	m_pOwnStream = CComPtr< IStream >();	629	m_pOwnStream = CComPtr< IStream >();
595	m_pExtStream = CComPtr< IStream >();	630	m_pExtStream = CComPtr< IStream >();
596	hr = pStg->DestroyElement( aOfficeEmbedStreamName );	631	hr = pStg->DestroyElement( aOfficeEmbedStreamName );
597	hr = pStg->DestroyElement( aExtentStreamName );	632	hr = pStg->DestroyElement( aExtentStreamName );
		633	#endif
598		634
599	OSL_ENSURE( SUCCEEDED( hr ), "Can not destroy created stream!\n" );	635	OSL_ENSURE( SUCCEEDED( hr ), "Can not destroy created stream!\n" );
600	if ( FAILED( hr ) )	636	if ( FAILED( hr ) )
Lines 609-616 Link Here
609	if ( !m_pDocHolder->GetDocument().is() \|\| !m_xFactory.is() \|\| !pStgSave \|\| !m_pOwnStream \|\| !m_pExtStream )	645	if ( !m_pDocHolder->GetDocument().is() \|\| !m_xFactory.is() \|\| !pStgSave \|\| !m_pOwnStream \|\| !m_pExtStream )
610	return E_FAIL;	646	return E_FAIL;
611		647
		648	#ifdef __MINGW32__
		649	XWindowsComPtr< IStream > pTargetStream;
		650	XWindowsComPtr< IStream > pNewExtStream;
		651	#else
612	CComPtr< IStream > pTargetStream;	652	CComPtr< IStream > pTargetStream;
613	CComPtr< IStream > pNewExtStream;	653	CComPtr< IStream > pNewExtStream;
		654	#endif
614		655
615	if ( !fSameAsLoad && pStgSave != m_pMasterStorage )	656	if ( !fSameAsLoad && pStgSave != m_pMasterStorage )
616	{	657	{
Lines 623-636 Link Here
623	if ( FAILED( hr ) ) return E_FAIL;	664	if ( FAILED( hr ) ) return E_FAIL;
624		665
625	DWORD nStreamMode = aStat.grfMode;	666	DWORD nStreamMode = aStat.grfMode;
		667	#ifdef __MINGW32__
		668	hr = pStgSave->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		669	#else
626	hr = pStgSave->CreateStream( aOfficeEmbedStreamName,	670	hr = pStgSave->CreateStream( aOfficeEmbedStreamName,
		671	#endif
627	STGM_CREATE \| ( nStreamMode & 0x73 ),	672	STGM_CREATE \| ( nStreamMode & 0x73 ),
628	0,	673	0,
629	0,	674	0,
630	&pTargetStream );	675	&pTargetStream );
631	if ( FAILED( hr ) \|\| !pTargetStream ) return E_FAIL;	676	if ( FAILED( hr ) \|\| !pTargetStream ) return E_FAIL;
632		677
		678	#ifdef __MINGW32__
		679	hr = pStgSave->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		680	#else
633	hr = pStgSave->CreateStream( aExtentStreamName,	681	hr = pStgSave->CreateStream( aExtentStreamName,
		682	#endif
634	STGM_CREATE \| ( nStreamMode & 0x73 ),	683	STGM_CREATE \| ( nStreamMode & 0x73 ),
635	0,	684	0,
636	0,	685	0,
Lines 684-691 Link Here
684		733
685	if ( SUCCEEDED( hr ) )	734	if ( SUCCEEDED( hr ) )
686	{	735	{
		736	#ifdef __MINGW32__
		737	m_pOwnStream = XWindowsComPtr< IStream >();
		738	m_pExtStream = XWindowsComPtr< IStream >();
		739	#else
687	m_pOwnStream = CComPtr< IStream >();	740	m_pOwnStream = CComPtr< IStream >();
688	m_pExtStream = CComPtr< IStream >();	741	m_pExtStream = CComPtr< IStream >();
		742	#endif
689	if ( fSameAsLoad \|\| pStgSave == m_pMasterStorage )	743	if ( fSameAsLoad \|\| pStgSave == m_pMasterStorage )
690	m_bIsDirty = sal_False;	744	m_bIsDirty = sal_False;
691	}	745	}
Lines 721-734 Link Here
721	if ( FAILED( hr ) ) return E_OUTOFMEMORY;	775	if ( FAILED( hr ) ) return E_OUTOFMEMORY;
722		776
723	DWORD nStreamMode = aStat.grfMode;	777	DWORD nStreamMode = aStat.grfMode;
		778	#ifdef __MINGW32__
		779	hr = m_pMasterStorage->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		780	#else
724	hr = m_pMasterStorage->OpenStream( aOfficeEmbedStreamName,	781	hr = m_pMasterStorage->OpenStream( aOfficeEmbedStreamName,
		782	#endif
725	0,	783	0,
726	nStreamMode & 0x73,	784	nStreamMode & 0x73,
727	0,	785	0,
728	&m_pOwnStream );	786	&m_pOwnStream );
729	if ( FAILED( hr ) \|\| !m_pOwnStream ) return E_OUTOFMEMORY;	787	if ( FAILED( hr ) \|\| !m_pOwnStream ) return E_OUTOFMEMORY;
730		788
		789	#ifdef __MINGW32__
		790	hr = m_pMasterStorage->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		791	#else
731	hr = m_pMasterStorage->OpenStream( aExtentStreamName,	792	hr = m_pMasterStorage->OpenStream( aExtentStreamName,
		793	#endif
732	0,	794	0,
733	nStreamMode & 0x73,	795	nStreamMode & 0x73,
734	0,	796	0,
Lines 747-755 Link Here
747		809
748	STDMETHODIMP EmbedDocument_Impl::HandsOffStorage()	810	STDMETHODIMP EmbedDocument_Impl::HandsOffStorage()
749	{	811	{
		812	#ifdef __MINGW32__
		813	m_pMasterStorage = XWindowsComPtr< IStorage >();
		814	m_pOwnStream = XWindowsComPtr< IStream >();
		815	m_pExtStream = XWindowsComPtr< IStream >();
		816	#else
750	m_pMasterStorage = CComPtr< IStorage >();	817	m_pMasterStorage = CComPtr< IStorage >();
751	m_pOwnStream = CComPtr< IStream >();	818	m_pOwnStream = CComPtr< IStream >();
752	m_pExtStream = CComPtr< IStream >();	819	m_pExtStream = CComPtr< IStream >();
		820	#endif
753		821
754	return S_OK;	822	return S_OK;
755	}	823	}
Lines 777-796 Link Here
777	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );	845	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );
778	hr = WriteFmtUserTypeStg( m_pMasterStorage,	846	hr = WriteFmtUserTypeStg( m_pMasterStorage,
779	cf, // ???	847	cf, // ???
		848	#ifdef __MINGW32__
		849	reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) );
		850	#else
780	( sal_Unicode* )aCurType.getStr() );	851	( sal_Unicode* )aCurType.getStr() );
		852	#endif
781	if ( FAILED( hr ) ) return E_FAIL;	853	if ( FAILED( hr ) ) return E_FAIL;
782		854
783	hr = m_pMasterStorage->SetClass( m_guid );	855	hr = m_pMasterStorage->SetClass( m_guid );
784	if ( FAILED( hr ) ) return E_FAIL;	856	if ( FAILED( hr ) ) return E_FAIL;
785		857
		858	#ifdef __MINGW32__
		859	hr = m_pMasterStorage->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ),
		860	#else
786	hr = m_pMasterStorage->CreateStream( aOfficeEmbedStreamName,	861	hr = m_pMasterStorage->CreateStream( aOfficeEmbedStreamName,
		862	#endif
787	STGM_CREATE \| ( nStreamMode & 0x73 ),	863	STGM_CREATE \| ( nStreamMode & 0x73 ),
788	0,	864	0,
789	0,	865	0,
790	&m_pOwnStream );	866	&m_pOwnStream );
791	if ( FAILED( hr ) \|\| !m_pOwnStream ) return E_FAIL;	867	if ( FAILED( hr ) \|\| !m_pOwnStream ) return E_FAIL;
792		868
		869	#ifdef __MINGW32__
		870	hr = m_pMasterStorage->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ),
		871	#else
793	hr = m_pMasterStorage->CreateStream( aExtentStreamName,	872	hr = m_pMasterStorage->CreateStream( aExtentStreamName,
		873	#endif
794	STGM_CREATE \| ( nStreamMode & 0x73 ),	874	STGM_CREATE \| ( nStreamMode & 0x73 ),
795	0,	875	0,
796	0,	876	0,
Lines 815-822 Link Here
815	pszFileName ) );	895	pszFileName ) );
816	hr = S_OK;	896	hr = S_OK;
817		897
		898	#ifdef __MINGW32__
		899	m_aFileName = ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) );
		900	#else
818	USES_CONVERSION;	901	USES_CONVERSION;
819	m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) );	902	m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) );
		903	#endif
820	}	904	}
821	catch( uno::Exception& )	905	catch( uno::Exception& )
822	{	906	{
Lines 829-835 Link Here
829	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );	913	CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" );
830	hr = WriteFmtUserTypeStg( m_pMasterStorage,	914	hr = WriteFmtUserTypeStg( m_pMasterStorage,
831	cf, // ???	915	cf, // ???
		916	#ifdef __MINGW32__
		917	reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) );
		918	#else
832	( sal_Unicode* )aCurType.getStr() );	919	( sal_Unicode* )aCurType.getStr() );
		920	#endif
833		921
834	if ( SUCCEEDED( hr ) )	922	if ( SUCCEEDED( hr ) )
835	{	923	{
Lines 879-886 Link Here
879	if ( !m_pDocHolder->GetDocument().is() \|\| !m_xFactory.is() )	967	if ( !m_pDocHolder->GetDocument().is() \|\| !m_xFactory.is() )
880	return E_FAIL;	968	return E_FAIL;
881		969
		970	#ifdef __MINGW32__
		971	::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) ) : m_aFileName;
		972	#else
882	USES_CONVERSION;	973	USES_CONVERSION;
883	::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( OLE2CW( pszFileName ) ) : m_aFileName;	974	::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( OLE2CW( pszFileName ) ) : m_aFileName;
		975	#endif
884	if ( !aTargetName.getLength() )	976	if ( !aTargetName.getLength() )
885	return E_FAIL;	977	return E_FAIL;
886		978
Lines 906-924 Link Here
906		998
907	STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )	999	STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
908	{	1000	{
		1001	#ifdef __MINGW32__
		1002	m_aFileName = ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) );
		1003	#else
909	m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) );	1004	m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) );
		1005	#endif
910	return S_OK;	1006	return S_OK;
911	}	1007	}
912		1008
913	STDMETHODIMP EmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )	1009	STDMETHODIMP EmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )
914	{	1010	{
		1011	#ifdef __MINGW32__
		1012	XWindowsComPtr<IMalloc> pMalloc;
		1013	#else
915	CComPtr<IMalloc> pMalloc;	1014	CComPtr<IMalloc> pMalloc;
		1015	#endif
916		1016
917	HRESULT hr = CoGetMalloc( 1, &pMalloc );	1017	HRESULT hr = CoGetMalloc( 1, &pMalloc );
918	if ( FAILED( hr ) \|\| !pMalloc ) return E_FAIL;	1018	if ( FAILED( hr ) \|\| !pMalloc ) return E_FAIL;
919		1019
920	ppszFileName = (LPOLESTR)( pMalloc->Alloc( sizeof( sal_Unicode ) ( m_aFileName.getLength() + 1 ) ) );	1020	ppszFileName = (LPOLESTR)( pMalloc->Alloc( sizeof( sal_Unicode ) ( m_aFileName.getLength() + 1 ) ) );
		1021	#ifdef __MINGW32__
		1022	wcsncpy( ppszFileName, reinterpret_cast< const WCHAR >( m_aFileName.getStr() ), m_aFileName.getLength() + 1 );
		1023	#else
921	wcsncpy( *ppszFileName, m_aFileName.getStr(), m_aFileName.getLength() + 1 );	1024	wcsncpy( *ppszFileName, m_aFileName.getStr(), m_aFileName.getLength() + 1 );
		1025	#endif
922		1026
923	return m_aFileName.getLength() ? S_OK : S_FALSE;	1027	return m_aFileName.getLength() ? S_OK : S_FALSE;
924	}	1028	}




// add mutex locking ???

DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory >& xFactory,EmbedDocument_Impl *pOLEInterface)
	: m_pOLEInterface(pOLEInterface),
	  m_pInterceptor(0),
	  m_xFactory( xFactory )
{
	const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) );
	uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY );

}

void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource )
		throw( uno::RuntimeException )
{
	if ( m_xDocument.is() && m_xDocument == aSource.Source )
	{

}

void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
		throw( uno::RuntimeException )
{
	uno::Reference< util::XCloseBroadcaster > xEventBroadcaster(
		aSource.Source, uno::UNO_QUERY );

}

void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource )
		throw( uno::RuntimeException )
{
	OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." );








uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL);






void SAL_CALL Interceptor::dispose()
	throw(::com::sun::star::uno::RuntimeException)
{
	lang::EventObject aEvt;
	aEvt.Source = static_cast< frame::XDispatch* >( this );

	DocumentHolder* pDocH)
	: m_pOLEInterface(pOLEInterface),
	  m_pDocH(pDocH),
	  m_pDisposeEventListeners(0),
	  m_pStatCL(0)
{
	m_aInterceptedURL[0] = rtl::OUString(
		RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));




#undef _DEBUG
#endif

#ifdef __MINGW32__
#include <windows.h>
#else
#include <atlbase.h>
CComModule _Module;
#include <atlcom.h>

BEGIN_OBJECT_MAP(ObjectMap)
END_OBJECT_MAP()
#endif

/////////////////////////////////////////////////////////////////////////////
// DLL Entry Point

{
    if (dwReason == DLL_PROCESS_ATTACH)
    {
#ifndef __MINGW32__
        _Module.Init(ObjectMap, hInstance, NULL);
#endif
        DisableThreadLibraryCalls(hInstance);
    }
    else if (dwReason == DLL_PROCESS_DETACH)
	{
#ifndef __MINGW32__
        _Module.Term();
#endif
	}
    return TRUE;    // ok
}

Lines 61-66 Link Here

(-)./embedserv/source/embed/register.cxx.orig (-1 / +2 lines)
61		61
62	//#include <rtl/unload.h>	62	//#include <rtl/unload.h>
63	//#include <osl/time.h>	63	//#include <osl/time.h>
		64	#define INITGUID
64	#include "servprov.hxx"	65	#include "servprov.hxx"
65		66
66	#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_	67	#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
Lines 152-158 Link Here
152	EmbedServer_getImplementationName() +	153	EmbedServer_getImplementationName() +
153	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );	154	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
154		155
155	uno::Sequence< ::rtl::OUString > &rServices = EmbedServer_getSupportedServiceNames();	156	const uno::Sequence< ::rtl::OUString > &rServices = EmbedServer_getSupportedServiceNames();
156	for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )	157	for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
157	xNewKey->createKey( rServices.getConstArray()[ind] );	158	xNewKey->createKey( rServices.getConstArray()[ind] );
158		159

Lines 2-7 Link Here

(-)./i18n_simple/prj/d.lst.orig (+1 lines)
2		2
3	..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll	3	..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll
4	..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so	4	..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so
		5	..\%__SRC%\lib\libi18n?????.a %_DEST%\lib%_EXT%\libi18n?????.a
5	..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib	6	..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib
6		7
7	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib	8	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib

Lines 29-33 Link Here

(-)./boost/prj/d.lst.orig (+1 lines)
29		29
30	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	30	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
31	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\.so	31	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\.so
		32	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\.a
32	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	33	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
33		34

Lines 5-8 Link Here

(-)./jvmaccess/prj/d.lst.orig (+1 lines)
5	..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib	5	..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib
6	..\%__SRC%\lib\libjvmaccess.so... %_DEST%\lib%_EXT%\*	6	..\%__SRC%\lib\libjvmaccess.so... %_DEST%\lib%_EXT%\*
7	..\%__SRC%\lib\libjvmaccess.dylib %_DEST%\lib%_EXT%\*	7	..\%__SRC%\lib\libjvmaccess.dylib %_DEST%\lib%_EXT%\*
		8	..\%__SRC%\lib\libjvmaccess.a %_DEST%\lib%_EXT%\
8	linklib: libjvmaccess.so...	9	linklib: libjvmaccess.so...

Lines 36-236 Link Here

(-)./curl/unx1-curl-7.9.8.patch.orig (-1 lines)
36		36
37	# This flag accepts an argument of the form current[:revision[:age]]. So,	37	# This flag accepts an argument of the form current[:revision[:age]]. So,
38	# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to	38	# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
39	*** misc/curl-7.9.8/lib/easy.c Tue May 7 11:58:14 2002

Lines 3-8 Link Here

(-)./jpeg/prj/d.lst.orig (+1 lines)
3		3
4	..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib	4	..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib
5	..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a	5	..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a
		6	..\%__SRC%\lib\libjpeglib_static.a %_DEST%\lib%_EXT%\libjpeglib_static.a
6		7
7	..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\jerror.h	8	..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\jerror.h
8	..\%__SRC%\inc\jpeglib.h %_DEST%\inc%_EXT%\external\jpeglib.h	9	..\%__SRC%\inc\jpeglib.h %_DEST%\inc%_EXT%\external\jpeglib.h

Lines 2-6 Link Here

(-)./accessibility/prj/d.lst.orig (-1 / +1 lines)
2	..\%__SRC%\class\java_accessibility.jar %_DEST%\bin%_EXT%\java_accessibility.jar	2	..\%__SRC%\class\java_accessibility.jar %_DEST%\bin%_EXT%\java_accessibility.jar
3		3
4	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	4	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
5	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	5	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
6		6




            if ( pJava_environment && pUno_environment )
            {
                g_unoMapping = Mapping(pUno_environment, pJava_environment);
                getCppuType((::com::sun::star::uno::Reference< XAccessible > *) 0).getDescription((typelib_TypeDescription **) & g_pTypeDescription);
            }
            
            if ( pJava_environment )

{
    if ( pWindow && pWindow->IsTopWindow() )
    {
        ::com::sun::star::uno::Reference< XAccessible > xAccessible;
    
        // Test for combo box - drop down floating windows first
        Window * pParentWindow = pWindow->GetParent();

            try 
            {
                // The parent window of a combo box floating window should have the role COMBO_BOX
                ::com::sun::star::uno::Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible());
                if ( xParentAccessible.is() )
                {
                    ::com::sun::star::uno::Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext());
                    if ( xParentAC.is() && (AccessibleRole::COMBO_BOX == xParentAC->getAccessibleRole()) )
                    {
                        // O.k. - this is a combo box floating window corresponding to the child of role LIST of the parent.

                        sal_Int32 nCount = xParentAC->getAccessibleChildCount();
                        for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++)
                        {
                            ::com::sun::star::uno::Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n);
                            if ( xChild.is() )
                            {
                                ::com::sun::star::uno::Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext();
                                if ( xChildAC.is() && (AccessibleRole::LIST == xChildAC->getAccessibleRole()) )
                                {
                                    xAccessible = xChild;

Lines 1-57 Link Here

(-)./icu/icu-2.2.patch.orig (-1 lines)
1	*** misc/icu/source/configure Fri Aug 9 19:20:54 2002

Lines 256-280 Link Here

(-)- misc/build/icu/source/icudefs.mk.in (-1 lines)
256	## Compiler switch to embed a library name	202	## Compiler switch to embed a library name
257	LD_SONAME = -h $(MIDDLE_SO_TARGET)	203	LD_SONAME = -h $(MIDDLE_SO_TARGET)
258		204
259	*** misc/icu/source/data/Makefile.in Thu Aug 15 19:08:02 2002

Lines 1054-1078 Link Here

(-)- misc/build/icu/source/data/Makefile.in (-1 lines)
1054	{	981	{
1055	const ScriptListTable *scriptListTable = NULL;	982	const ScriptListTable *scriptListTable = NULL;
1056	const LangSysTable *langSysTable = NULL;	983	const LangSysTable *langSysTable = NULL;
1057	*** misc/icu/source/layout/Makefile.in Sat Jul 20 01:24:32 2002

Lines 1107-1109 Link Here

(-)./zlib/prj/d.lst.orig (+2 lines)
1107	return tempGlyphCount;	1015	return tempGlyphCount;
1108	};	1016	};
1109		1017
		1018	--- misc/build/icu/source/extra/uconv/uconv.dsp.orig 2003-07-27 22:46:30.000000000 +0900
Lines 5-10 Link Here
5	..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zconf.h	5	..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zconf.h
6		6
7	..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a	7	..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
		8	..\%__SRC%\lib\libzlib_static.a %_DEST%\lib%_EXT%\libzlib_static.a
8	..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib	9	..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
9	..\%__SRC%\slb\zlib.lin %_DEST%\lib%_EXT%\zlib.lin	10	..\%__SRC%\slb\zlib.lin %_DEST%\lib%_EXT%\zlib.lin
10		11

Lines 65-71 Link Here

(-)./cosv/source/comphelp/badcast.cxx.orig (-1 / +1 lines)
65	due to problems with WNT-STL-headers.	65	due to problems with WNT-STL-headers.
66	*/	66	*/
67		67
68	#ifdef WNT	68	#if defined(WNT) && !defined(__MINGW32__)
69		69
70	#define _NTSDK	70	#define _NTSDK
71	#include<typeinfo>	71	#include<typeinfo>

Lines 6-9 Link Here

(-)./expat/prj/d.lst.orig (+3 lines)
6	..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a	6	..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a
7	..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a	7	..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a
8	..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a	8	..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a
		9	..\%__SRC%\lib\libexpat_xmltok_static.a %_DEST%\lib%_EXT%\libexpat_xmltok_static.a
		10	..\%__SRC%\lib\libexpat_xmlparse_static.a %_DEST%\lib%_EXT%\libexpat_xmlparse_static.a
		11	..\%__SRC%\lib\libascii_expat_xmlparse_static.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse_static.a
9		12

Lines 1-5 Link Here

(-)./filter/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%	4	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
4	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.jar	5	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.jar
5	..\%__SRC%\class\XSLTFilter\.jar %_DEST%\bin%_EXT%\.jar	6	..\%__SRC%\class\XSLTFilter\.jar %_DEST%\bin%_EXT%\.jar

Lines 3-5 Link Here

(-)./neon/prj/d.lst.orig (+1 lines)
3	..\%__SRC%\inc\.h %_DEST%\inc%_EXT%\external\neon\.h	3	..\%__SRC%\inc\.h %_DEST%\inc%_EXT%\external\neon\.h
4	..\%__SRC%\slb\neon.lib %_DEST%\lib%_EXT%\neon.lib	4	..\%__SRC%\slb\neon.lib %_DEST%\lib%_EXT%\neon.lib
5	..\%__SRC%\lib\libneon.a %_DEST%\lib%_EXT%\libneon.a	5	..\%__SRC%\lib\libneon.a %_DEST%\lib%_EXT%\libneon.a
		6	..\%__SRC%\lib\libneon_static.a %_DEST%\lib%_EXT%\libneon_static.a

Lines 3-9 Link Here

(-)./stlport/STLport-4.5.patch.orig (-3 / +5 lines)
3	***************	3	***************
4	* 1 **	4	* 1 **
5	! dummy	5	! dummy
6	--- 1,130 ----	6	--- 1,132 ----
7	!	7	!
8	! /* Define to be the neon version string */	8	! /* Define to be the neon version string */
9	! #define NEON_VERSION "0.23.5"	9	! #define NEON_VERSION "0.23.5"
Lines 126-134 Link Here
126	! #define vsnprintf _vsnprintf	126	! #define vsnprintf _vsnprintf
127	! #define strcasecmp strcmpi	127	! #define strcasecmp strcmpi
128	! #define strncasecmp strnicmp	128	! #define strncasecmp strnicmp
129	! #define ssize_t int
130	! #define inline __inline	129	! #define inline __inline
		130	! #ifndef __MINGW32__
		131	! #define ssize_t int
131	! #define off_t _off_t	132	! #define off_t _off_t
		133	! #endif
132	!	134	!
133	! #include <io.h>	135	! #include <io.h>
134	! #define read _read	136	! #define read _read
Lines 203-205 Link Here
203	/* If we get a non-2xx response back here, we wipe the value for	205	/* If we get a non-2xx response back here, we wipe the value for
204	* each of the properties in this propstat, so the caller knows to	206	* each of the properties in this propstat, so the caller knows to
205	* look at the status instead. It's annoying, since for each prop	207	* look at the status instead. It's annoying, since for each prop
		208	--- misc/build/neon-0.23.5/src/ne_utils.h.orig 2002-08-18 21:48:48.000000000 +0900
Lines 200-272 Link Here
200		200
201	CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g	201	CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
202	CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC	202	CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
203	*** misc/STLport-4.5/stlport/config/stl_gcc.h Tue Sep 4 12:10:16 2001

Lines 385-387 Link Here

(-)./i18npool/source/indexentry/indexentrysupplier_default.cxx.orig (+6 lines)
385	! # $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@	318	! # $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
386	!	319	!
387	!	320	!
		321	--- misc/build/STLport-4.5/src/gcc-3.0-mingw.mak.orig 2003-12-14 22:00:00.000000000 +0900
Lines 247-249 Link Here
247	// wouldn't, for example, simplify the exception-handling code.	247	// wouldn't, for example, simplify the exception-handling code.
248	template <class _Val, class _Key, class _HF,	248	template <class _Val, class _Key, class _HF,
249	class _ExK, class _EqK, class _All>	249	class _ExK, class _EqK, class _All>
		250	--- misc/build/STLport-4.5-0119/stlport/config/stl_msvc.h.orig 2002-12-28 15:12:58.000000000 +0900
Lines 69-74 Link Here
69		69
70	namespace com { namespace sun { namespace star { namespace i18n {	70	namespace com { namespace sun { namespace star { namespace i18n {
71		71
		72	static inline sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2) {
		73	return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;
		74	}
		75
72	IndexEntrySupplier_Unicode::IndexEntrySupplier_Unicode(const Reference < XMultiServiceFactory >& rxMSF) :	76	IndexEntrySupplier_Unicode::IndexEntrySupplier_Unicode(const Reference < XMultiServiceFactory >& rxMSF) :
73	IndexEntrySupplier(rxMSF)	77	IndexEntrySupplier(rxMSF)
74	{	78	{




		if (address != 0xFFFF)
		    address = PhoneticCharacter_ko[address + (ch & 0xFF)];
		if (address != 0xFFFF)
		    candidate += OUString::valueOf(sal_Unicode(address));
		else
		    candidate += space;
	    }

			getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm );
}

//#if (_MSC_VER < 1300)
static inline sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2) {
    return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;
}
//#else
//extern sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2);
//#endif

sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException )
{





..\%__SRC%\bin\i18npool*.dll %_DEST%\bin%_EXT%\i18npool*.dll
..\%__SRC%\lib\libi18npool*.so %_DEST%\lib%_EXT%\libi18npool*.so
..\%__SRC%\lib\libi18npool*.a %_DEST%\lib%_EXT%\libi18npool*.a
..\%__SRC%\lib\libi18npool*.dylib %_DEST%\lib%_EXT%\libi18npool*.dylib
..\%__SRC%\lib\ii18npool.lib %_DEST%\lib%_EXT%\ii18npool.lib

..\%__SRC%\bin\i18nsearch*.dll %_DEST%\bin%_EXT%\i18nsearch*.dll
..\%__SRC%\lib\libi18nsearch*.so %_DEST%\lib%_EXT%\libi18nsearch*.so
..\%__SRC%\lib\libi18nsearch*.a %_DEST%\lib%_EXT%\libi18nsearch*.a
..\%__SRC%\lib\libi18nsearch*.dylib %_DEST%\lib%_EXT%\libi18nsearch*.dylib
..\%__SRC%\lib\ii18nsearch.lib %_DEST%\lib%_EXT%\ii18nsearch.lib

..\%__SRC%\bin\localedata_*.dll %_DEST%\bin%_EXT%\localedata_*.dll
..\%__SRC%\lib\liblocaledata_*.so %_DEST%\lib%_EXT%\liblocaledata_*.so
..\%__SRC%\lib\liblocaledata_*.a %_DEST%\lib%_EXT%\liblocaledata_*.a
..\%__SRC%\lib\liblocaledata_*.dylib %_DEST%\lib%_EXT%\liblocaledata_*.dylib

..\%__SRC%\bin\dict_*.dll %_DEST%\bin%_EXT%\dict_*.dll
..\%__SRC%\lib\libdict_*.so %_DEST%\lib%_EXT%\libdict_*.so
..\%__SRC%\lib\libdict_*.a %_DEST%\lib%_EXT%\libdict_*.a
..\%__SRC%\lib\libdict_*.dylib %_DEST%\lib%_EXT%\libdict_*.dylib

..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib

Lines 140-148 Link Here

(-)./i18npool/inc/indexentrysupplier.hxx.orig (-1 / +5 lines)
140	sal_Char *implementationName;	140	sal_Char *implementationName;
141	com::sun::star::lang::Locale aLocale;	141	com::sun::star::lang::Locale aLocale;
142	rtl::OUString aSortAlgorithm;	142	rtl::OUString aSortAlgorithm;
143	friend sal_Bool SAL_CALL operator == (const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2);	143	// friend sal_Bool SAL_CALL operator == (const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2);
144	};	144	};
145		145
		146	//inline sal_Bool operator == (const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2) {
		147	// return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;
		148	//};
		149
146	} } } }	150	} } } }
147		151
148	#endif	152	#endif

Lines 5-8 Link Here

(-)./sablot/prj/d.lst.orig (+1 lines)
5		5
6	..\%__SRC%\slb\sablot.lib %_DEST%\lib%_EXT%\sablot.lib	6	..\%__SRC%\slb\sablot.lib %_DEST%\lib%_EXT%\sablot.lib
7	..\%__SRC%\lib\libsablot.a %_DEST%\lib%_EXT%\libsablot.a	7	..\%__SRC%\lib\libsablot.a %_DEST%\lib%_EXT%\libsablot.a
		8	..\%__SRC%\lib\libsablot_static.a %_DEST%\lib%_EXT%\libsablot_static.a
8		9

Lines 242-247 Link Here

(-)./fpicker/source/win32/folderpicker/FolderPicker.cxx.orig (+1 lines)
242	// -------------------------------------------------	242	// -------------------------------------------------
243		243
244	void SAL_CALL CFolderPicker::cancel( )	244	void SAL_CALL CFolderPicker::cancel( )
		245	throw(RuntimeException)
245	{	246	{
246	OSL_ASSERT( m_pFolderPickerImpl.get( ) );	247	OSL_ASSERT( m_pFolderPickerImpl.get( ) );
247	MutexGuard aGuard( m_aMutex );	248	MutexGuard aGuard( m_aMutex );

Lines 150-156 Link Here

(-)./fpicker/source/win32/folderpicker/FolderPicker.hxx.orig (-1 / +2 lines)
150	// XCancellable	150	// XCancellable
151	//------------------------------------------------	151	//------------------------------------------------
152		152
153	virtual void SAL_CALL cancel( );	153	virtual void SAL_CALL cancel( )
		154	throw(::com::sun::star::uno::RuntimeException);
154		155
155	//------------------------------------------------	156	//------------------------------------------------
156	// overwrite base class method, which is called	157	// overwrite base class method, which is called




#include "MtaFop.hxx"
#include <wchar.h>
#include <process.h>
#ifdef __MINGW32__
template<class T>
class XWindowsComPtr
{
public:
	XWindowsComPtr()
	{
		p=NULL;
	}
	~XWindowsComPtr()
	{
		if (p)
			p->Release();
	}
	XWindowsComPtr(const XWindowsComPtr<T>& lp)
	{
		if ((p = lp.p) != NULL)
			p->AddRef();
	}
	XWindowsComPtr(T* lp)
	{
		if ((p = lp) != NULL)
			p->AddRef();
	}
	T* operator=(const XWindowsComPtr<T>& lp)
	{
		return assign(lp.p);
	}
	T* operator=(T* lp)
	{
		return assign(lp);
	}
	bool operator!() const
	{
		return (p == NULL);
	}
	operator T*() const
	{
		return p;
	}
	T* operator->() const
	{
		return p;
	}
	T** operator&()
	{
		return &p;
	}
private:
	T* assign(T* lp)
	{
	  if (lp != NULL)
	    lp->AddRef();
	  if (p)
	    p->Release();
	  return p = lp;
	}
	bool operator==(T* pT) const
	{
		return p == pT;
	}
	T* p;
};
typedef XWindowsComPtr< IMalloc > IMallocPtr;
typedef XWindowsComPtr< IShellFolder > IShellFolderPtr;
class _com_error {
public:
	// Constructors
	//
	_com_error(HRESULT hr,
               IErrorInfo* perrinfo = NULL,
               bool fAddRef = false) throw();
	_com_error(const _com_error& that) throw();

	// Destructor
	//
	virtual ~_com_error() throw();

	// Assignment operator
	//
	_com_error& operator=(const _com_error& that) throw();

	// Accessors
	//
	HRESULT Error() const throw() { return m_hresult; }
	WORD WCode() const throw();
	IErrorInfo * ErrorInfo() const throw();

	// IErrorInfo method accessors
	//
//	_bstr_t Description() const throw(_com_error);
	DWORD HelpContext() const throw();
//	_bstr_t HelpFile() const throw(_com_error);
//	_bstr_t Source() const throw(_com_error);
//	GUID GUID() const throw();

	// FormatMessage accessors
	const TCHAR * ErrorMessage() const throw();

	// EXCEPINFO.wCode <-> HRESULT mappers
	static HRESULT WCodeToHRESULT(WORD wCode) throw();
	static WORD HRESULTToWCode(HRESULT hr) throw();

private:
	enum {
		WCODE_HRESULT_FIRST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x200),
		WCODE_HRESULT_LAST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF+1, 0) - 1
	};
	const HRESULT			m_hresult;
	IErrorInfo *			m_perrinfo;
	mutable TCHAR *			m_pszMsg;
};
#else
#include <comdef.h>
#endif

#ifndef _RESOURCEPROVIDER_HXX_
#include "..\misc\resourceprovider.hxx"

Lines 75-80 Link Here

(-)./fpicker/source/win32/folderpicker/MtaFop.hxx.orig (+3 lines)
75	#endif	75	#endif
76		76
77	#include <utility>	77	#include <utility>
		78	#ifdef __MINGW32__
		79	#include <windows.h>
		80	#endif
78	#include <objidl.h>	81	#include <objidl.h>
79	#include <shlobj.h>	82	#include <shlobj.h>
80		83

Lines 403-409 Link Here

(-)./fpicker/source/win32/filepicker/FilePicker.cxx.orig (-1 / +2 lines)
403	//-----------------------------------------------------------------------------------------	403	//-----------------------------------------------------------------------------------------
404		404
405	void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName)	405	void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName)
406	throw(lang::IllegalArgumentException, uno::RuntimeException)	406	throw(uno::RuntimeException)
407	{	407	{
408	OSL_ASSERT(0 != m_pImpl.get());	408	OSL_ASSERT(0 != m_pImpl.get());
409	osl::MutexGuard aGuard(m_aMutex);	409	osl::MutexGuard aGuard(m_aMutex);
Lines 760-765 Link Here
760	//------------------------------------------------------------------------------------	760	//------------------------------------------------------------------------------------
761		761
762	void SAL_CALL CFilePicker::cancel()	762	void SAL_CALL CFilePicker::cancel()
		763	throw(uno::RuntimeException)
763	{	764	{
764	OSL_ASSERT(m_pImpl.get());	765	OSL_ASSERT(m_pImpl.get());
765		766




		throw( ::com::sun::star::uno::RuntimeException );

    virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName ) 
		throw( ::com::sun::star::uno::RuntimeException );

    virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory ) 
		throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );

	// XCancellable
	//------------------------------------------------

    virtual void SAL_CALL cancel( )
		throw(::com::sun::star::uno::RuntimeException);

	//------------------------------------------------
    // XEventListener

	CFilePicker& operator=( const CFilePicker& );

private:
	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;   // to instanciate own services		
    CAsyncEventNotifier				                                               m_aAsyncEventNotifier;
	std::auto_ptr<CWinFileOpenImpl>	    										   m_pImpl;	
}; 

Lines 11-16 Link Here

(-)./berkeleydb/prj/d.lst.orig (+4 lines)
11	..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so	11	..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
12	..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so	12	..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so
13		13
		14	..\%__SRC%\lib\libdb-3.2.a %_DEST%\lib%_EXT%\libdb-3.2.a
		15	..\%__SRC%\lib\libdb_java-3.2.a %_DEST%\lib%_EXT%\libdb_java-3.2.a
		16	..\%__SRC%\lib\libdb_cxx-3.2.a %_DEST%\lib%_EXT%\libdb_cxx-3.2.a
		17
14	..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib	18	..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib
15	..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib	19	..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib
16	..\%__SRC%\lib\libdb_cxx-3.2.dylib %_DEST%\lib%_EXT%\libdb_cxx-3.2.dylib	20	..\%__SRC%\lib\libdb_cxx-3.2.dylib %_DEST%\lib%_EXT%\libdb_cxx-3.2.dylib

Lines 43-199 Link Here

(-)./berkeleydb/db-3.2.9.patch.orig (-1 lines)
43		43
44	CC= @MAKEFILE_CC@	44	CC= @MAKEFILE_CC@
45	CCLINK= @MAKEFILE_CCLINK@	45	CCLINK= @MAKEFILE_CCLINK@
46	*** misc/db-3.2.9/dist/configure 2001-01-24 16:16:18.000000000 +0100

Lines 206-486 Link Here

(-)- misc/build/db-3.2.9/dist/configure (-1 lines)
206	*) JINCSUBDIRS="genunix";;	55	*) JINCSUBDIRS="genunix";;
207	esac	56	esac
208		57
209	*** misc/db-3.2.9/dist/ltconfig 2000-10-13 22:23:00.000000000 +0200

Lines 1-2 Link Here

(-)./testtools/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\
2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\	2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\
		3	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\

Lines 1-4 Link Here

(-)./padmin/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res	1	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res
2	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	2	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin
3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		4	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
4	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib	5	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib

Lines 1-5 Link Here

(-)./psprint/util/libpsp_mingw.map.orig (-1 / +1 lines)
1	{	1	{
2	local:	2	global:
3	AddTable;	3	AddTable;
4	CloseTTFont;	4	CloseTTFont;
5	cmapAdd;	5	cmapAdd;

Lines 1-6 Link Here

(-)./psprint/prj/d.lst.orig (+2 lines)
1	mkdir: %_DEST%\inc%_EXT%\psprint	1	mkdir: %_DEST%\inc%_EXT%\psprint
2		2
		3	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	4	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		5	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\slb\apsp.lib %_DEST%\lib%_EXT%\apsp.lib	6	..\%__SRC%\slb\apsp.lib %_DEST%\lib%_EXT%\apsp.lib
5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	7	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
6		8

Lines 70-76 Link Here

(-)./shell/source/win32/simplemail/simplemapi.hxx.orig (+3 lines)
70		70
71	#include <windows.h>	71	#include <windows.h>
72	#include <mapi.h>	72	#include <mapi.h>
		73	#ifdef __MINGW32__
		74	#else
73	#include <mapix.h>	75	#include <mapix.h>
		76	#endif
74		77
75	//----------------------------------------------------------	78	//----------------------------------------------------------
76	// class declaration	79	// class declaration

Lines 446-452 Link Here

(-)./shell/source/win32/simplemail/smplmailclient.cxx.orig (+4 lines)
446	osl::FileBase::getSystemPathFromFileURL(	446	osl::FileBase::getSystemPathFromFileURL(
447	aAttachementList[i], aSysPath );	447	aAttachementList[i], aSysPath );
448		448
		449	#ifdef __MINGW32__
		450	if ( osl::FileBase::E_None != rc )
		451	#else
449	if ( osl::FileBase::RC::E_None != rc )	452	if ( osl::FileBase::RC::E_None != rc )
		453	#endif
450	throw IllegalArgumentException(	454	throw IllegalArgumentException(
451	OUString::createFromAscii( " " ),	455	OUString::createFromAscii( " " ),
452	static_cast< XSimpleMailClient* >( this ),	456	static_cast< XSimpleMailClient* >( this ),

Lines 67-72 Link Here

(-)./shell/source/win32/shlxthandler/classfactory.cxx.orig (-4 / +4 lines)
67	#include "classfactory.hxx"	67	#include "classfactory.hxx"
68	#endif	68	#endif
69		69
		70	#ifndef _SHLXTHDL_HXX_
		71	#include "shlxthdl.hxx"
		72	#endif
		73
70	#ifndef _INFOTIP_HXX_	74	#ifndef _INFOTIP_HXX_
71	#include "infotip.hxx"	75	#include "infotip.hxx"
72	#endif	76	#endif
Lines 79-88 Link Here
79	#include "columnprovider.hxx"	83	#include "columnprovider.hxx"
80	#endif	84	#endif
81		85
82	#ifndef _SHLXTHDL_HXX_
83	#include "shlxthdl.hxx"
84	#endif
85
86	//-----------------------------	86	//-----------------------------
87	//	87	//
88	//-----------------------------	88	//-----------------------------

Lines 62-67 Link Here

(-)./shell/source/win32/shlxthandler/classfactory.hxx.orig (+4 lines)
62	#ifndef _CLASSFACTORY_HXX_	62	#ifndef _CLASSFACTORY_HXX_
63	#define _CLASSFACTORY_HXX_	63	#define _CLASSFACTORY_HXX_
64		64
		65	#ifdef __MINGW32__
		66	#include <wtypes.h>
		67	#include <objbase.h>
		68	#endif
65	#include <objidl.h>	69	#include <objidl.h>
66		70
67	class CClassFactory : public IClassFactory	71	class CClassFactory : public IClassFactory

Lines 14-20 Link Here

(-)./shell/source/win32/shlxthandler/zipexcptn.hxx.orig (-2 / +2 lines)
14	{	14	{
15	public:	15	public:
16	RuntimeException(int Error);	16	RuntimeException(int Error);
17	virtual ~RuntimeException();	17	virtual ~RuntimeException() throw();
18		18
19	int GetErrorCode() const;	19	int GetErrorCode() const;
20		20
Lines 40-46 Link Here
40	{	40	{
41	public:	41	public:
42	Win32Exception(int Error);	42	Win32Exception(int Error);
43	virtual ~Win32Exception();	43	virtual ~Win32Exception() throw();
44		44
45	virtual const char* what() const throw();	45	virtual const char* what() const throw();
46		46

Lines 62-67 Link Here

(-)./shell/source/win32/shlxthandler/infotip.hxx.orig (+4 lines)
62	#ifndef _INFOTIP_HXX_	62	#ifndef _INFOTIP_HXX_
63	#define _INFOTIP_HXX_	63	#define _INFOTIP_HXX_
64		64
		65	#ifdef __MINGW32__
		66	#include <wtypes.h>
		67	#include <objbase.h>
		68	#endif
65	#include <objidl.h>	69	#include <objidl.h>
66	#include <shlobj.h>	70	#include <shlobj.h>
67	#include <string>	71	#include <string>

Lines 78-84 Link Here

(-)./shell/source/win32/shlxthandler/zipexcptn.cxx.orig (-2 / +2 lines)
78	//------------------------------------------	78	//------------------------------------------
79	/**	79	/**
80	*/	80	*/
81	RuntimeException::~RuntimeException()	81	RuntimeException::~RuntimeException() throw()
82	{	82	{
83	}	83	}
84		84
Lines 118-124 Link Here
118	//------------------------------------------	118	//------------------------------------------
119	/**	119	/**
120	*/	120	*/
121	Win32Exception::~Win32Exception()	121	Win32Exception::~Win32Exception() throw()
122	{	122	{
123	if (m_MsgBuff)	123	if (m_MsgBuff)
124	LocalFree(m_MsgBuff);	124	LocalFree(m_MsgBuff);

Lines 74-79 Link Here

(-)./shell/source/win32/shlxthandler/types.hxx.orig (-1 / +1 lines)
74	typedef std::pair<Characters_t, XmlTagAttributes_t> XmlTag_t;	74	typedef std::pair<Characters_t, XmlTagAttributes_t> XmlTag_t;
75	typedef std::map<Name_t, XmlTag_t> XmlTags_t;	75	typedef std::map<Name_t, XmlTag_t> XmlTags_t;
76		76
77	#define EMPTY_XML_TAG std::make_pair(std::wstring(), XmlTagAttributes_t())	77	#define EMPTY_XML_TAG std::make_pair(Characters_t(), XmlTagAttributes_t())
78		78
79	#endif	79	#endif

Lines 287-293 Link Here

(-)./shell/source/win32/shlxthandler/xmlprsr.cxx.orig (-2 / +2 lines)
287		287
288	while(atts[i])	288	while(atts[i])
289	{	289	{
290	xml_attribs[GetLocalName(atts[i])] = atts[i+1];	290	xml_attribs[GetLocalName(reinterpret_cast< LPCWSTR >(atts[i]))] = reinterpret_cast< LPCWSTR >(atts[i+1]);
291	i += 2; // skip to next pair	291	i += 2; // skip to next pair
292	}	292	}
293		293
Lines 322-328 Link Here
322	SaxParser* pImpl = reinterpret_cast<SaxParser*>(XML_GetUserData(parser));	322	SaxParser* pImpl = reinterpret_cast<SaxParser*>(XML_GetUserData(parser));
323		323
324	if (pImpl->m_SaxDocumentHandler)	324	if (pImpl->m_SaxDocumentHandler)
325	pImpl->m_SaxDocumentHandler->Characters(std::wstring(s, len));	325	pImpl->m_SaxDocumentHandler->Characters(std::wstring(reinterpret_cast< LPCWSTR >(s), len));
326	}	326	}
327		327
328	//---------------------------------	328	//---------------------------------

Lines 85-90 Link Here

(-)./shell/source/win32/shlxthandler/infotip.cxx.orig (+6 lines)
85		85
86	#include "resource.h"	86	#include "resource.h"
87		87
		88	#ifdef __MINGW32__
		89	#define INITGUID
		90	#include <initguid.h>
		91	DEFINE_GUID(IID_IQueryInfo,0x00021500,0,0,0xc0,0,0,0,0,0,0,0x46);
		92	#endif
		93
88	//-----------------------------	94	//-----------------------------
89	//	95	//
90	//-----------------------------	96	//-----------------------------

Lines 1-4 Link Here

(-)./shell/source/tools/lngconvex/lngconvex.cxx.orig (-5 / +14 lines)
1	// Test_Stl_Stream.cpp : Definiert den Einsprungpunkt für die Konsolenanwendung.	1	// Test_Stl_Stream.cpp : Definiert den Einsprungpunkt f die Konsolenanwendung.
2	//	2	//
3		3
4	//#define WIN32_LEAN_AND_MEAN	4	//#define WIN32_LEAN_AND_MEAN
Lines 655-661 Link Here
655		655
656	for (/**/ ;rct_iter != rct_iter_end; ++rct_iter)	656	for (/**/ ;rct_iter != rct_iter_end; ++rct_iter)
657	{	657	{
658	std::istringstream iss = rct_iter->m_Line;	658	std::istringstream iss(rct_iter->m_Line);
659	std::string line;	659	std::string line;
660		660
661	while (iss)	661	while (iss)
Lines 732-741 Link Here
732	rtl::OUString oustr_abs_name = GetAbsoluteDirectory(	732	rtl::OUString oustr_abs_name = GetAbsoluteDirectory(
733	module_dir, OStr2OUStr(cmdline.GetArgument("-c").c_str()));	733	module_dir, OStr2OUStr(cmdline.GetArgument("-c").c_str()));
734		734
		735	{
		736	std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr());
735	ReadCtryLngFile(	737	ReadCtryLngFile(
736	std::ifstream(OUStr2OStr(oustr_abs_name).getStr()),	738	temp,
737	substitutor,	739	substitutor,
738	g_country_lng_file_countries);	740	g_country_lng_file_countries);
		741	}
739		742
740	oustr_abs_name = GetAbsoluteDirectory(	743	oustr_abs_name = GetAbsoluteDirectory(
741	module_dir, OStr2OUStr(cmdline.GetArgument("-lng").c_str()));	744	module_dir, OStr2OUStr(cmdline.GetArgument("-lng").c_str()));
Lines 765-773 Link Here
765	oustr_abs_name = GetAbsoluteDirectory(	768	oustr_abs_name = GetAbsoluteDirectory(
766	module_dir, OStr2OUStr(cmdline.GetArgument("-rch").c_str()));	769	module_dir, OStr2OUStr(cmdline.GetArgument("-rch").c_str()));
767		770
		771	{
		772	std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr());
768	FileAppendRcHeader(	773	FileAppendRcHeader(
769	rc_output_file,	774	rc_output_file,
770	std::ifstream(OUStr2OStr(oustr_abs_name).getStr()));	775	temp);
		776	}
771		777
772	InflateRcTemplateAndAppendToFile(	778	InflateRcTemplateAndAppendToFile(
773	rc_output_file,	779	rc_output_file,
Lines 778-786 Link Here
778	oustr_abs_name = GetAbsoluteDirectory(	784	oustr_abs_name = GetAbsoluteDirectory(
779	module_dir, OStr2OUStr(cmdline.GetArgument("-rcf").c_str()));	785	module_dir, OStr2OUStr(cmdline.GetArgument("-rcf").c_str()));
780		786
		787	{
		788	std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr());
781	FileAppendRcFooter(	789	FileAppendRcFooter(
782	rc_output_file,	790	rc_output_file,
783	std::ifstream(OUStr2OStr(oustr_abs_name).getStr()));	791	temp);
		792	}
784		793
785	}	794	}
786	catch(const std::ios::failure& ex)	795	catch(const std::ios::failure& ex)

Lines 628-634 Link Here

(-)./soltools/ldump/ldump.cxx.orig (-1 / +1 lines)
628	*********************************************************************/	628	*********************************************************************/
629		629
630		630
631	usage()	631	int usage()
632	{	632	{
633	LibDump::DumpError(99);	633	LibDump::DumpError(99);
634	exit(0);	634	exit(0);




HashTable::~HashTable()
{
    // Wenn die HashTable der Owner der Objecte ist,
    // msen die Destruktoren separat gerufen werden.
    // Dies geschieht er die virtuelle Methode OnDeleteObject()
    //
    // Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!!
    //          Der Code muß deshalb ins Macro

    }
    */

    // Speicher f HashItems freigeben
    delete [] m_pData;
}

void* HashTable::GetObjectAt(unsigned long lPos) const
// Gibt Objekt zurk, wenn es eines gibt, sonst NULL;
{
    HashItem *pItem = &m_pData[lPos];


}

unsigned long HashTable::Probe(unsigned long lPos) const
// gibt den Folgewert von lPos zurk
{
    lPos++; if (lPos==m_lSize) lPos=0;
    return lPos;

bool HashTable::Insert(const char * Key, void* pObject)
// pre:  Key ist nicht im Dictionary enthalten, sonst return FALSE
//       Dictionary ist nicht voll, sonst return FALSE
// post: pObject ist unter Key im Dictionary; m_nElem wurde erht
{
    SmartGrow();



HashItem* HashTable::FindPos(const char * Key) const
// sucht den Key; gibt Refrenz auf den Eintrag (gefunden)
// oder NULL (nicht gefunden) zurk
//
// pre:  -
// post: -

}

void* HashTable::Find(const char *Key) const
// Gibt Verweis des Objektes zurk, das unter Key abgespeichert ist,
// oder NULL wenn nicht vorhanden.
//
// pre:  -

}

void* HashTable::Delete( const char * Key)
// Lcht Objekt, das unter Key abgespeichert ist und gibt Verweis
// darauf zurk.
// Gibt NULL zurk, wenn Key nicht vorhanden ist.
//
// pre:  -
// post: Objekt ist nicht mehr enthalten; m_lElem dekrementiert
//       Wenn die HashTable der Owner ist, wurde das Object gelcht
{
    HashItem *pItem = FindPos(Key);


    unsigned long     lOldSize = m_lSize;              // alte Daten sichern
    HashItem* pOldData = m_pData;

    m_lSize = (unsigned long) (m_dGrowFactor * m_lSize); // neue Gre
    m_pData = new HashItem[m_lSize];           // neue Daten holen

    // kein Speicher:

Lines 79-87 Link Here

(-)./idlc/source/astexpression.cxx.orig (+6 lines)
79	#undef MINCHAR	79	#undef MINCHAR
80	#define MINCHAR -128	80	#define MINCHAR -128
81		81
		82	#ifdef __MINGW32__
		83	#define MAXINT64 9223372036854775807LL
		84	#define MININT64 -9223372036854775807LL-1
		85	#define MAXUINT64 18446744073709551615ULL
		86	#else
82	#define MAXINT64 9223372036854775807	87	#define MAXINT64 9223372036854775807
83	#define MININT64 -9223372036854775807-1	88	#define MININT64 -9223372036854775807-1
84	#define MAXUINT64 18446744073709551615	89	#define MAXUINT64 18446744073709551615
		90	#endif
85		91
86	using namespace ::rtl;	92	using namespace ::rtl;
87		93

Lines 144-149 Link Here

(-)./idlc/source/parser.y.orig (+2 lines)
144	return res;	144	return res;
145	}	145	}
146		146
		147	#if defined (_MSC_VER) && (_MSC_VER < 1310)
147	void* malloc( size_t size )	148	void* malloc( size_t size )
148	{	149	{
149	return ::malloc(size);	150	return ::malloc(size);
Lines 153-158 Link Here
153	{	154	{
154	::free(memblock);	155	::free(memblock);
155	}	156	}
		157	#endif
156		158
157	};	159	};
158	#endif	160	#endif

Lines 2-7 Link Here

(-)./xmlscript/prj/d.lst.orig (+1 lines)
2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
3	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	3	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
4	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	4	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		5	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	6	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
6		7
7	..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx	8	..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx

Lines 89-95 Link Here

(-)./dtrans/source/win32/mtaole/MtaOleClipb.cxx.orig (-1 / +9 lines)
89		89
90	#include <wchar.h>	90	#include <wchar.h>
91	#include <process.h>	91	#include <process.h>
92	#include <comdef.h>	92	#include "..\..\inc\common.hxx"
93		93
94	//----------------------------------------------------------------	94	//----------------------------------------------------------------
95	// namespace directives	95	// namespace directives
Lines 699-705 Link Here
699	{	699	{
700	LRESULT lResult = 0;	700	LRESULT lResult = 0;
701		701
		702	#ifdef __MINGW32__
		703	try
		704	#else
702	__try	705	__try
		706	#endif
703	{	707	{
704	// get a connection to the class-instance via the static member	708	// get a connection to the class-instance via the static member
705	CMtaOleClipboard* pImpl = CMtaOleClipboard::s_theMtaOleClipboardInst;	709	CMtaOleClipboard* pImpl = CMtaOleClipboard::s_theMtaOleClipboardInst;
Lines 777-783 Link Here
777	break;	781	break;
778	}	782	}
779	}	783	}
		784	#ifdef __MINGW32__
		785	catch(...)
		786	#else
780	__except( EXCEPTION_EXECUTE_HANDLER )	787	__except( EXCEPTION_EXECUTE_HANDLER )
		788	#endif
781	{	789	{
782	OSL_ENSURE( sal_False, "Kernel exception in window-proc caught!" );	790	OSL_ENSURE( sal_False, "Kernel exception in window-proc caught!" );
783	}	791	}

Lines 144-160 Link Here

(-)./dtrans/source/win32/misc/ImplHelper.cxx.orig (-14 / +72 lines)
144	OUString winCP;	144	OUString winCP;
145		145
146	// set an default value	146	// set an default value
		147	#ifdef __MINGW32__
		148	wchar_t wcstr[10];
		149	#else
147	sal_Unicode wcstr[10];	150	sal_Unicode wcstr[10];
		151	#endif
148		152
149	if ( LOCALE_IDEFAULTCODEPAGE == lctype )	153	if ( LOCALE_IDEFAULTCODEPAGE == lctype )
150	{	154	{
151	_itow( GetOEMCP( ), wcstr, 10 );	155	_itow( GetOEMCP( ), wcstr, 10 );
		156	#ifdef __MINGW32__
		157	winCP = OUString( reinterpret_cast< sal_Unicode * >( wcstr ), wcslen( wcstr ) );
		158	#else
152	winCP = OUString( wcstr, wcslen( wcstr ) );	159	winCP = OUString( wcstr, wcslen( wcstr ) );
		160	#endif
153	}	161	}
154	else if ( LOCALE_IDEFAULTANSICODEPAGE == lctype )	162	else if ( LOCALE_IDEFAULTANSICODEPAGE == lctype )
155	{	163	{
156	_itow( GetACP( ), wcstr, 10 );	164	_itow( GetACP( ), wcstr, 10 );
		165	#ifdef __MINGW32__
		166	winCP = OUString( reinterpret_cast< sal_Unicode * >( wcstr ), wcslen( wcstr ) );
		167	#else
157	winCP = OUString( wcstr, wcslen( wcstr ) );	168	winCP = OUString( wcstr, wcslen( wcstr ) );
		169	#endif
158	}	170	}
159	else	171	else
160	OSL_ASSERT( sal_False );	172	OSL_ASSERT( sal_False );
Lines 179-186 Link Here
179	if ( NULL != lpwchBuff.get( ) )	191	if ( NULL != lpwchBuff.get( ) )
180	{	192	{
181	len = MultiByteToWideChar(	193	len = MultiByteToWideChar(
		194	#ifdef __MINGW32__
		195	CP_ACP, 0, buff, -1, reinterpret_cast< wchar_t * >( lpwchBuff.get( ) ), len );
		196	#else
182	CP_ACP, 0, buff, -1, lpwchBuff.get( ), len );	197	CP_ACP, 0, buff, -1, lpwchBuff.get( ), len );
183		198	#endif
184	winCP = OUString( lpwchBuff.get( ), (len - 1) );	199	winCP = OUString( lpwchBuff.get( ), (len - 1) );
185	}	200	}
186	}	201	}
Lines 239-247 Link Here
239	{	254	{
240	OSL_ASSERT( IsValidCodePage( codepage ) );	255	OSL_ASSERT( IsValidCodePage( codepage ) );
241		256
		257	#ifdef __MINGW32__
		258	wchar_t cpStr[6];
		259	_itow( codepage, cpStr, 10 );
		260	return OUString( reinterpret_cast< sal_Unicode * >( cpStr ), wcslen( cpStr ) );
		261	#else
242	sal_Unicode cpStr[6];	262	sal_Unicode cpStr[6];
243	_itow( codepage, cpStr, 10 );	263	_itow( codepage, cpStr, 10 );
244	return OUString( cpStr, wcslen( cpStr ) );	264	return OUString( cpStr, wcslen( cpStr ) );
		265	#endif
245	}	266	}
246		267
247	//-------------------------------------------------------------------------	268	//-------------------------------------------------------------------------
Lines 257-267 Link Here
257		278
258	void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )	279	void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
259	{	280	{
		281	#ifdef __MINGW32__
		282	try
		283	#else
260	__try	284	__try
		285	#endif
261	{	286	{
262	CoTaskMemFree( ptd );	287	CoTaskMemFree( ptd );
263	}	288	}
		289	#ifdef __MINGW32__
		290	catch(...)
		291	#else
264	__except( EXCEPTION_EXECUTE_HANDLER )	292	__except( EXCEPTION_EXECUTE_HANDLER )
		293	#endif
265	{	294	{
266	OSL_ENSURE( sal_False, "Error DeleteTargetDevice" );	295	OSL_ENSURE( sal_False, "Error DeleteTargetDevice" );
267	}	296	}
Lines 291-297 Link Here
291	{	320	{
292	DVTARGETDEVICE* ptdDest = NULL;	321	DVTARGETDEVICE* ptdDest = NULL;
293		322
		323	#ifdef __MINGW32__
		324	try
		325	#else
294	__try	326	__try
		327	#endif
295	{	328	{
296	if ( NULL != ptdSrc )	329	if ( NULL != ptdSrc )
297	{	330	{
Lines 299-305 Link Here
299	rtl_copyMemory( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) );	332	rtl_copyMemory( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) );
300	}	333	}
301	}	334	}
		335	#ifdef __MINGW32__
		336	catch(...)
		337	#else
302	__except( EXCEPTION_EXECUTE_HANDLER )	338	__except( EXCEPTION_EXECUTE_HANDLER )
		339	#endif
303	{	340	{
304	}	341	}
305		342
Lines 337-346 Link Here
337	{	374	{
338	sal_Bool bRet = sal_False;	375	sal_Bool bRet = sal_False;
339		376
		377	#ifdef __MINGW32__
		378	try
		379	#else
340	__try	380	__try
		381	#endif
341	{	382	{
342	if ( petcDest == petcSrc )	383	if ( petcDest != petcSrc )
343	__leave;	384	{
344		385
345	petcDest->cfFormat = petcSrc->cfFormat;	386	petcDest->cfFormat = petcSrc->cfFormat;
346		387
Lines 353-360 Link Here
353	petcDest->tymed = petcSrc->tymed;	394	petcDest->tymed = petcSrc->tymed;
354		395
355	bRet = sal_True;	396	bRet = sal_True;
		397	}
356	}	398	}
		399	#ifdef __MINGW32__
		400	catch(...)
		401	#else
357	__except( EXCEPTION_EXECUTE_HANDLER )	402	__except( EXCEPTION_EXECUTE_HANDLER )
		403	#endif
358	{	404	{
359	OSL_ENSURE( sal_False, "Error CopyFormatEtc" );	405	OSL_ENSURE( sal_False, "Error CopyFormatEtc" );
360	}	406	}
Lines 374-405 Link Here
374	{	420	{
375	sal_Int32 nMatch = FORMATETC_EXACT_MATCH;	421	sal_Int32 nMatch = FORMATETC_EXACT_MATCH;
376		422
		423	#ifdef __MINGW32__
		424	try
		425	#else
377	__try	426	__try
		427	#endif
378	{	428	{
379	if ( pFetcLhs == pFetcRhs )	429	if ( pFetcLhs != pFetcRhs )
380	__leave;
381		430
382	if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) \|\|	431	if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) \|\|
383	( pFetcLhs->lindex != pFetcRhs->lindex ) \|\|	432	( pFetcLhs->lindex != pFetcRhs->lindex ) \|\|
384	!CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) )	433	!CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) )
385	{	434	{
386	nMatch = FORMATETC_NO_MATCH;	435	nMatch = FORMATETC_NO_MATCH;
387	__leave;
388	}	436	}
389		437
390	if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect )	438	else if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect )
391	// same aspects; equal	439	// same aspects; equal
392	;	440	;
393	else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 )	441	else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 )
394	{	442	{
395	// left not subset of aspects of right; not equal	443	// left not subset of aspects of right; not equal
396	nMatch = FORMATETC_NO_MATCH;	444	nMatch = FORMATETC_NO_MATCH;
397	__leave;
398	}	445	}
399	else	446	else
400	// left subset of right	447	// left subset of right
401	nMatch = FORMATETC_PARTIAL_MATCH;	448	nMatch = FORMATETC_PARTIAL_MATCH;
402		449
		450	if ( nMatch == FORMATETC_EXACT_MATCH \|\| nMatch == FORMATETC_PARTIAL_MATCH )
		451	{
403	if ( pFetcLhs->tymed == pFetcRhs->tymed )	452	if ( pFetcLhs->tymed == pFetcRhs->tymed )
404	// same medium flags; equal	453	// same medium flags; equal
405	;	454	;
Lines 407-419 Link Here
407	{	456	{
408	// left not subset of medium flags of right; not equal	457	// left not subset of medium flags of right; not equal
409	nMatch = FORMATETC_NO_MATCH;	458	nMatch = FORMATETC_NO_MATCH;
410	__leave;
411	}	459	}
412	else	460	else
413	// left subset of right	461	// left subset of right
414	nMatch = FORMATETC_PARTIAL_MATCH;	462	nMatch = FORMATETC_PARTIAL_MATCH;
		463	}
415	}	464	}
		465	#ifdef __MINGW32__
		466	catch(...)
		467	#else
416	__except( EXCEPTION_EXECUTE_HANDLER )	468	__except( EXCEPTION_EXECUTE_HANDLER )
		469	#endif
417	{	470	{
418	OSL_ENSURE( sal_False, "Error CompareFormatEtc" );	471	OSL_ENSURE( sal_False, "Error CompareFormatEtc" );
419	nMatch = FORMATETC_NO_MATCH;	472	nMatch = FORMATETC_NO_MATCH;
Lines 431-456 Link Here
431	{	484	{
432	sal_Bool bRet = sal_False;	485	sal_Bool bRet = sal_False;
433		486
		487	#ifdef __MINGW32__
		488	try
		489	#else
434	__try	490	__try
		491	#endif
435	{	492	{
436	if ( ptdLeft == ptdRight )	493	if ( ptdLeft == ptdRight )
437	{	494	{
438	// same address of td; must be same (handles NULL case)	495	// same address of td; must be same (handles NULL case)
439	bRet = sal_True;	496	bRet = sal_True;
440	__leave;
441	}	497	}
442		498
443	// one ot the two is NULL	499	// one ot the two is NULL
444	if ( ( NULL == ptdRight ) \|\| ( NULL == ptdLeft ) )	500	else if ( ( NULL != ptdRight ) && ( NULL != ptdLeft ) )
445	__leave;
446		501
447	if ( ptdLeft->tdSize != ptdRight->tdSize )	502	if ( ptdLeft->tdSize == ptdRight->tdSize )
448	__leave;
449		503
450	if ( rtl_compareMemory( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 )	504	if ( rtl_compareMemory( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 )
451	bRet = sal_True;	505	bRet = sal_True;
452	}	506	}
		507	#ifdef __MINGW32__
		508	catch(...)
		509	#else
453	__except( EXCEPTION_EXECUTE_HANDLER )	510	__except( EXCEPTION_EXECUTE_HANDLER )
		511	#endif
454	{	512	{
455	OSL_ENSURE( sal_False, "Error CompareTargetDevice" );	513	OSL_ENSURE( sal_False, "Error CompareTargetDevice" );
456	bRet = sal_False;	514	bRet = sal_False;

Lines 67-73 Link Here

(-)./dtrans/source/win32/dtobj/APNDataObject.hxx.orig (-1 / +1 lines)
67	// includes	67	// includes
68	//------------------------------------------------------------------------	68	//------------------------------------------------------------------------
69		69
70	#include <comdef.h>	70	#include "..\..\inc\common.hxx"
71		71
72	//------------------------------------------------------------------------	72	//------------------------------------------------------------------------
73	// deklarations	73	// deklarations




#endif


#if(_MSC_VER < 1300) && !defined(__MINGW32__)
#include <olestd.h>
#endif


using namespace com::sun::star::io;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
//using CStgTransferHelper::CStgTransferException;

//------------------------------------------------------------------------
// 


		ReleaseStgMedium( &stgmedium );
	}
	catch( CStgTransferHelper::CStgTransferException& )
	{		
		ReleaseStgMedium( &stgmedium );
		throw IOException( );

Lines 91-97 Link Here

(-)./dtrans/source/win32/dtobj/DOTransferable.hxx.orig (-1 / +1 lines)
91	#include <com/sun/star/datatransfer/XSystemTransferable.hpp>	91	#include <com/sun/star/datatransfer/XSystemTransferable.hpp>
92	#endif	92	#endif
93		93
94	#include <comdef.h>	94	#include "..\..\inc\common.hxx"
95		95
96	//------------------------------------------------------------------------	96	//------------------------------------------------------------------------
97	// deklarations	97	// deklarations

Lines 105-111 Link Here

(-)./dtrans/source/win32/dtobj/DataFmtTransl.cxx.orig (-1 / +1 lines)
105		105
106	#include <windows.h>	106	#include <windows.h>
107		107
108	#if (_MSC_VER < 1300)	108	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
109	#include <olestd.h>	109	#include <olestd.h>
110	#endif	110	#endif
111		111

Lines 97-102 Link Here

(-)./dtrans/source/win32/dtobj/XTDataObject.cxx.orig (-3 / +13 lines)
97		97
98	#include <windows.h>	98	#include <windows.h>
99	#include <shlobj.h>	99	#include <shlobj.h>
		100	#include "..\..\inc\common.hxx"
100		101
101	//------------------------------------------------------------------------	102	//------------------------------------------------------------------------
102	// namespace directives	103	// namespace directives
Lines 107-113 Link Here
107	using namespace com::sun::star::uno;	108	using namespace com::sun::star::uno;
108	using namespace com::sun::star::lang;	109	using namespace com::sun::star::lang;
109	using namespace rtl;	110	using namespace rtl;
110	using CStgTransferHelper::CStgTransferException;	111	//using CStgTransferHelper::CStgTransferException;
111		112
112	//------------------------------------------------------------------------	113	//------------------------------------------------------------------------
113	// a helper class that will be thrown by the function validateFormatEtc	114	// a helper class that will be thrown by the function validateFormatEtc
Lines 147-154 Link Here
147	HRESULT hr = E_NOINTERFACE;	148	HRESULT hr = E_NOINTERFACE;
148		149
149	*ppvObject = NULL;	150	*ppvObject = NULL;
		151	#ifdef __MINGW32__
		152	if ( ( IID_IUnknown == iid ) \|\|
		153	( IID_IDataObject == iid ) )
		154	#else
150	if ( ( __uuidof( IUnknown ) == iid ) \|\|	155	if ( ( __uuidof( IUnknown ) == iid ) \|\|
151	( __uuidof( IDataObject ) == iid ) )	156	( __uuidof( IDataObject ) == iid ) )
		157	#endif
152	{	158	{
153	ppvObject = static_cast< IUnknown >( this );	159	ppvObject = static_cast< IUnknown >( this );
154	( (LPUNKNOWN)*ppvObject )->AddRef( );	160	( (LPUNKNOWN)*ppvObject )->AddRef( );
Lines 218-224 Link Here
218	{	224	{
219	return ex.m_hr;	225	return ex.m_hr;
220	}	226	}
221	catch( CStgTransferException& ex )	227	catch( CStgTransferHelper::CStgTransferException& ex )
222	{	228	{
223	return translateStgExceptionCode( ex.m_hr );	229	return translateStgExceptionCode( ex.m_hr );
224	}	230	}
Lines 405-411 Link Here
405	{	411	{
406	OSL_ENSURE( sal_False, "Unexpected exception" );	412	OSL_ENSURE( sal_False, "Unexpected exception" );
407	}	413	}
408	catch( CStgTransferException& ex )	414	catch( CStgTransferHelper::CStgTransferException& ex )
409	{	415	{
410	return translateStgExceptionCode( ex.m_hr );	416	return translateStgExceptionCode( ex.m_hr );
411	}	417	}
Lines 479-485 Link Here
479		485
480	WideCharToMultiByteEx(	486	WideCharToMultiByteEx(
481	GetACP( ),	487	GetACP( ),
		488	#ifdef __MINGW32__
		489	reinterpret_cast< const wchar_t * >( const_cast< const sal_Unicode * >( aUnicodeText.getStr( ) ) ),
		490	#else
482	static_cast< const sal_Unicode* >( aUnicodeText.getStr( ) ),	491	static_cast< const sal_Unicode* >( aUnicodeText.getStr( ) ),
		492	#endif
483	aUnicodeText.getLength( ),	493	aUnicodeText.getLength( ),
484	stgTransfHelper );	494	stgTransfHelper );
485		495

Lines 76-84 Link Here

(-)./dtrans/source/win32/dtobj/XNotifyingDataObject.hxx.orig (-2 / +2 lines)
76	#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>	76	#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
77	#endif	77	#endif
78		78
79	#include <objidl.h>
80	#include <windows.h>	79	#include <windows.h>
81	#include <comdef.h>	80	#include <objidl.h>
		81	#include "..\..\inc\common.hxx"
82		82
83	/*--------------------------------------------------------------------------	83	/*--------------------------------------------------------------------------
84	To implement the lostOwnership mechanism cleanly we need this wrapper	84	To implement the lostOwnership mechanism cleanly we need this wrapper




}

void SAL_CALL SourceContext::setCursor( sal_Int32 cursorId )
	throw( RuntimeException)
{
}

void SAL_CALL SourceContext::setImage( sal_Int32 imageId )
	throw( RuntimeException)
{
}


Lines 110-118 Link Here

(-)./dtrans/source/win32/dnd/sourcecontext.hxx.orig (-2 / +2 lines)
110	virtual sal_Int32 SAL_CALL getCurrentCursor( )	110	virtual sal_Int32 SAL_CALL getCurrentCursor( )
111	throw( RuntimeException);	111	throw( RuntimeException);
112	virtual void SAL_CALL setCursor( sal_Int32 cursorId )	112	virtual void SAL_CALL setCursor( sal_Int32 cursorId )
113	throw( IllegalArgumentException, RuntimeException);	113	throw( RuntimeException);
114	virtual void SAL_CALL setImage( sal_Int32 imageId )	114	virtual void SAL_CALL setImage( sal_Int32 imageId )
115	throw( IllegalArgumentException, RuntimeException);	115	throw( RuntimeException);
116	virtual void SAL_CALL transferablesFlavorsChanged( )	116	virtual void SAL_CALL transferablesFlavorsChanged( )
117	throw( RuntimeException);	117	throw( RuntimeException);
118		118

Lines 83-89 Link Here

(-)./dtrans/source/win32/dnd/source.hxx.orig (-1 / +1 lines)
83	#include "../../inc/DtObjFactory.hxx"	83	#include "../../inc/DtObjFactory.hxx"
84	#include "globals.hxx"	84	#include "globals.hxx"
85	#include <oleidl.h>	85	#include <oleidl.h>
86	#include <comdef.h>	86	#include "..\..\inc\common.hxx"
87		87
88		88
89	using namespace ::com::sun::star::lang;	89	using namespace ::com::sun::star::lang;

Lines 84-89 Link Here

(-)./dtrans/source/win32/dnd/target.hxx.orig (+1 lines)
84	#include <osl/mutex.hxx>	84	#include <osl/mutex.hxx>
85	#endif	85	#endif
86		86
		87	#include <windows.h>
87	#include <oleidl.h>	88	#include <oleidl.h>
88	#include "globals.hxx"	89	#include "globals.hxx"
89	#include "../../inc/DtObjFactory.hxx"	90	#include "../../inc/DtObjFactory.hxx"

Lines 83-89 Link Here

(-)./dtrans/source/win32/dnd/source.cxx.orig (-1 / +1 lines)
83	#include "sourcecontext.hxx"	83	#include "sourcecontext.hxx"
84	#include "../../inc/DtObjFactory.hxx"	84	#include "../../inc/DtObjFactory.hxx"
85	#include <rtl/ustring.h>	85	#include <rtl/ustring.h>
86	#include <comdef.h>	86	#include "..\..\inc\common.hxx"
87	#include <process.h>	87	#include <process.h>
88	#include <winuser.h>	88	#include <winuser.h>
89	#include <stdio.h>	89	#include <stdio.h>

Lines 92-98 Link Here

(-)./dtrans/source/win32/clipb/WinClipbImpl.hxx.orig (-1 / +1 lines)
92	#endif	92	#endif
93		93
94	#include <windows.h>	94	#include <windows.h>
95	#include <comdef.h>	95	#include "..\..\inc\common.hxx"
96		96
97	class CWinClipboard;	97	class CWinClipboard;
98	class CXNotifyingDataObject;	98	class CXNotifyingDataObject;

Lines 75-81 Link Here

(-)./dtrans/source/inc/DtObjFactory.hxx.orig (-1 / +1 lines)
75	#include <cppuhelper/servicefactory.hxx>	75	#include <cppuhelper/servicefactory.hxx>
76	#endif	76	#endif
77		77
78	#include <comdef.h>	78	#include "..\..\inc\common.hxx"
79		79
80	//------------------------------------------------------------------------	80	//------------------------------------------------------------------------
81	// deklarations	81	// deklarations

Lines 70-75 Link Here

(-)./dtrans/source/inc/MtaOleClipb.hxx.orig (+3 lines)
70	#include <osl/mutex.hxx>	70	#include <osl/mutex.hxx>
71	#endif	71	#endif
72		72
		73	#ifdef __MINGW32__
		74	#include <windows.h>
		75	#endif
73	#include <objidl.h>	76	#include <objidl.h>
74		77
75	//--------------------------------------------------------	78	//--------------------------------------------------------

Lines 1-4 Link Here

(-)./dtrans/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	1	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		2	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	3	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4		5

Lines 9-14 Link Here

(-)./odk/prj/d.lst.orig (+1 lines)
9		9
10	..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll	10	..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll
11	..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so	11	..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so
		12	..\%__SRC%\lib\libofficebean.a %_DEST%\lib%_EXT%\libofficebean.a
12	..\%__SRC%\lib\officebean.dylib %_DEST%\lib%_EXT%\officebean.dylib	13	..\%__SRC%\lib\officebean.dylib %_DEST%\lib%_EXT%\officebean.dylib
13		14
14	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"	15	dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"

Lines 1-5 Link Here

(-)./package/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map	1	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map
2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	2	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		4	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\dtd\.dtd %_DEST%\bin%_EXT%\.*	6	..\dtd\.dtd %_DEST%\bin%_EXT%\.*

Lines 18-23 Link Here

(-)./ucb/prj/d.lst.orig (+1 lines)
18		18
19	..\%__SRC%\bin\ucp.dll %_DEST%\bin%_EXT%\ucp.dll	19	..\%__SRC%\bin\ucp.dll %_DEST%\bin%_EXT%\ucp.dll
20	..\%__SRC%\lib\libucp.so %_DEST%\lib%_EXT%\libucp.so	20	..\%__SRC%\lib\libucp.so %_DEST%\lib%_EXT%\libucp.so
		21	..\%__SRC%\lib\libucp.a %_DEST%\lib%_EXT%\libucp.a
21	..\%__SRC%\lib\libucp.dylib %_DEST%\lib%_EXT%\libucp.dylib	22	..\%__SRC%\lib\libucp.dylib %_DEST%\lib%_EXT%\libucp.dylib
22	..\%__SRC%\misc\ucp.map %_DEST%\bin%_EXT%\ucp.map	23	..\%__SRC%\misc\ucp.map %_DEST%\bin%_EXT%\ucp.map
23	..\%__SRC%\misc\ucp.sym %_DEST%\bin%_EXT%\ucp.sym	24	..\%__SRC%\misc\ucp.sym %_DEST%\bin%_EXT%\ucp.sym

Lines 5-10 Link Here

(-)./framework/prj/d.lst.orig (+1 lines)
5	..\%__SRC%\bin\.exe %_DEST%\bin%_EXT%\	5	..\%__SRC%\bin\.exe %_DEST%\bin%_EXT%\
6	..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin	6	..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin
7	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	7	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		8	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
8	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%	9	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
9		10
10	..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd	11	..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd

Lines 1-5 Link Here

(-)./sax/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\.so	2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\.so
		3	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\.a
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4		5
5		6

Lines 1-5 Link Here

(-)./xmlhelp/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.*	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.*
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.*	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.*
4	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.*	5	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.*
5	..\%__SRC%\misc\helpserver.sh %_DEST%\bin%_EXT%\helpserver	6	..\%__SRC%\misc\helpserver.sh %_DEST%\bin%_EXT%\helpserver

Lines 1-6 Link Here

(-)./fileaccess/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\
2	..\%__SRC%\bin\.rdb %_DEST%\rdb%_EXT%\	2	..\%__SRC%\bin\.rdb %_DEST%\rdb%_EXT%\
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\
5	..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml	6	..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml
6		7

Lines 1-6 Link Here

(-)./comphelper/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	6	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	7	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 1-5 Link Here

(-)./configmgr/prj/d.lst.orig (+1 lines)
1	mkdir: %_DEST%\inc%_EXT%\configmgr	1	mkdir: %_DEST%\inc%_EXT%\configmgr
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
5	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	6	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll




/* Many other libraries have conflicting prototypes for getopt, with
   differences in the consts, in stdlib.h.  To avoid compilation
   errors, only prototype getopt for the GNU C library.  */
extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
# else /* not __GNU_LIBRARY__ */
extern int getopt ();
# endif /* __GNU_LIBRARY__ */

# ifndef __need_getopt
extern int getopt_long (int ___argc, char *const *___argv, const char *__shortopts,
		        const struct option *__longopts, int *__longind);
extern int getopt_long_only (int ___argc, char *const *___argv,
			     const char *__shortopts,
		             const struct option *__longopts, int *__longind);

/* Internal only.  Users should not call this directly.  */
extern int _getopt_internal (int ___argc, char *const *___argv,
			     const char *__shortopts,
		             const struct option *__longopts, int *__longind,
			     int __long_only);

Lines 1-5 Link Here

(-)./extensions/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		3	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
3	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib	4	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib
4	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	5	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin
5	..\%__SRC%\misc\.hid %_DEST%\bin%_EXT%\.hid	6	..\%__SRC%\misc\.hid %_DEST%\bin%_EXT%\.hid

Lines 1-6 Link Here

(-)./unotools/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	2	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	6	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	7	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 39-45 Link Here

(-)./unzip/source/mapname.c.orig (-1 / +1 lines)
39	#endif	39	#endif
40		40
41	#ifndef NO_MKDIR	41	#ifndef NO_MKDIR
42	# if (defined(DOS_OS2) && !defined(__GO32__))	42	# if (defined(DOS_OS2) && !defined(__GO32__)) \|\| defined(__MINGW32__)
43	# if (_MSC_VER >= 600) /* have special MSC mkdir prototype */	43	# if (_MSC_VER >= 600) /* have special MSC mkdir prototype */
44	# include <direct.h>	44	# include <direct.h>
45	# else /* own prototype because dir.h conflicts? */	45	# else /* own prototype because dir.h conflicts? */

Lines 1274-1279 Link Here

(-)./unzip/inc/unzip.h.orig (+2 lines)
1274	#endif	1274	#endif
1275		1275
1276	#ifndef UNX	1276	#ifndef UNX
		1277	#ifndef __MINGW32__
1277	typedef void UnzipCallBack ( long nBytesWritten );	1278	typedef void UnzipCallBack ( long nBytesWritten );
1278	extern UnzipCallBack *pCallBack;	1279	extern UnzipCallBack *pCallBack;
1279	#endif	1280	#endif
		1281	#endif

Lines 1-3 Link Here

(-)./eventattacher/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%	1	..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%	4	..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%

Lines 4-9 Link Here

(-)./io/prj/d.lst.orig (+1 lines)
4	..\source\connector\connectr.xml %_DEST%\xml%_EXT%\connector.uno.xml	4	..\source\connector\connectr.xml %_DEST%\xml%_EXT%\connector.uno.xml
5	..\source\stm\stm.xml %_DEST%\xml%_EXT%\streams.uno.xml	5	..\source\stm\stm.xml %_DEST%\xml%_EXT%\streams.uno.xml
6	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\	6	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\
		7	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\
7	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\	8	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\
8		9
9	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib	10	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib

Lines 156-162 Link Here

(-)./svtools/source/uno/registerservices.cxx.orig (-1 / +2 lines)
156	{	156	{
157	try	157	try
158	{	158	{
159	::rtl::OUString sImplKeyName( '/' );	159	::rtl::OUString sImplKeyName;
		160	sImplKeyName = String( sal_Unicode('/') );
160	sImplKeyName += _rImplName;	161	sImplKeyName += _rImplName;
161	sImplKeyName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES" );	162	sImplKeyName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES" );
162	Reference< XRegistryKey > xNewKey = _rxLocation->createKey( sImplKeyName );	163	Reference< XRegistryKey > xNewKey = _rxLocation->createKey( sImplKeyName );

Lines 240-246 Link Here

(-)./svtools/source/svdde/ddedata.cxx.orig (+4 lines)
240	TCHAR szName[ 256 ];	240	TCHAR szName[ 256 ];
241		241
242	if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) )	242	if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) )
		243	#ifdef __MINGW32__
		244	nFmt = SotExchange::RegisterFormatName( String(reinterpret_cast< unsigned short int * >(szName)) );
		245	#else
243	nFmt = SotExchange::RegisterFormatName( String(szName) );	246	nFmt = SotExchange::RegisterFormatName( String(szName) );
		247	#endif
244	}	248	}
245	#endif	249	#endif
246	#if defined(PM2)	250	#if defined(PM2)

Lines 136-142 Link Here

(-)./svtools/source/svdde/ddeinf.cxx.orig (+12 lines)
136	p++ = '\|'; p = 0;	136	p++ = '\|'; p = 0;
137	DdeQueryString( hDdeInst, aInf.hszTopic, p, sizeof(buf)/sizeof(TCHAR)-lstrlen( buf ),	137	DdeQueryString( hDdeInst, aInf.hszTopic, p, sizeof(buf)/sizeof(TCHAR)-lstrlen( buf ),
138	CP_WINUNICODE );	138	CP_WINUNICODE );
		139	#ifdef __MINGW32__
		140	aServices.Insert( new String( reinterpret_cast< unsigned short int * >(buf) ) );
		141	#else
139	aServices.Insert( new String( buf ) );	142	aServices.Insert( new String( buf ) );
		143	#endif
140	}	144	}
141	}	145	}
142	DdeDisconnectList( hConvList );	146	DdeDisconnectList( hConvList );
Lines 164-174 Link Here
164		168
165	DdeTopicList::DdeTopicList( const String& rService )	169	DdeTopicList::DdeTopicList( const String& rService )
166	{	170	{
		171	#ifdef __MINGW32__
		172	DdeConnection aSys( rService, String( reinterpret_cast< unsigned short int * >(SZDDESYS_TOPIC) ) );
		173	#else
167	DdeConnection aSys( rService, String( SZDDESYS_TOPIC ) );	174	DdeConnection aSys( rService, String( SZDDESYS_TOPIC ) );
		175	#endif
168		176
169	if ( !aSys.GetError() )	177	if ( !aSys.GetError() )
170	{	178	{
		179	#ifdef __MINGW32__
		180	DdeRequest aReq( aSys, String( reinterpret_cast< unsigned short int * >(SZDDESYS_ITEM_TOPICS) ), 500 );
		181	#else
171	DdeRequest aReq( aSys, String( SZDDESYS_ITEM_TOPICS ), 500 );	182	DdeRequest aReq( aSys, String( SZDDESYS_ITEM_TOPICS ), 500 );
		183	#endif
172	aReq.SetDataHdl( LINK( this, DdeTopicList, Data ) );	184	aReq.SetDataHdl( LINK( this, DdeTopicList, Data ) );
173	aReq.Execute();	185	aReq.Execute();
174	}	186	}

Lines 147-153 Link Here

(-)./svtools/source/svdde/ddesvr.cxx.orig (+50 lines)
147	while( STRING_NOTFOUND != n )	147	while( STRING_NOTFOUND != n )
148	{	148	{
149	String s( sTopics.GetToken( 0, '\t', n ));	149	String s( sTopics.GetToken( 0, '\t', n ));
		150	#ifdef __MINGW32__
		151	if( s == reinterpret_cast< unsigned short int * >(chTopicBuf) )
		152	#else
150	if( s == chTopicBuf )	153	if( s == chTopicBuf )
		154	#endif
151	++nTopics;	155	++nTopics;
152	}	156	}
153	}	157	}
Lines 201-207 Link Here
201	{	205	{
202	String s( sTopics.GetToken( 0, '\t', n ));	206	String s( sTopics.GetToken( 0, '\t', n ));
203	s.EraseAllChars( '\n' ).EraseAllChars( '\r' );	207	s.EraseAllChars( '\n' ).EraseAllChars( '\r' );
		208	#ifdef __MINGW32__
		209	if( !hText1 \|\| s == reinterpret_cast< unsigned short int * >(chTopicBuf) )
		210	#else
204	if( !hText1 \|\| s == chTopicBuf )	211	if( !hText1 \|\| s == chTopicBuf )
		212	#endif
205	{	213	{
206	DdeString aDStr( pInst->hDdeInstSvr, s );	214	DdeString aDStr( pInst->hDdeInstSvr, s );
207	pTopic = FindTopic( *pService, (HSZ)aDStr );	215	pTopic = FindTopic( *pService, (HSZ)aDStr );
Lines 303-308 Link Here
303	String aRes; // darf erst am Ende freigegeben werden!!	311	String aRes; // darf erst am Ende freigegeben werden!!
304	if ( pTopic->IsSystemTopic() )	312	if ( pTopic->IsSystemTopic() )
305	{	313	{
		314	#ifdef __MINGW32__
		315	if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_TOPICS) )
		316	aRes = pService->Topics();
		317	else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_SYSITEMS) )
		318	aRes = pService->SysItems();
		319	else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_STATUS) )
		320	aRes = pService->Status();
		321	else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_FORMATS) )
		322	aRes = pService->Formats();
		323	else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_HELP) )
		324	#else
306	if ( pTopic->aItem == SZDDESYS_ITEM_TOPICS )	325	if ( pTopic->aItem == SZDDESYS_ITEM_TOPICS )
307	aRes = pService->Topics();	326	aRes = pService->Topics();
308	else if ( pTopic->aItem == SZDDESYS_ITEM_SYSITEMS )	327	else if ( pTopic->aItem == SZDDESYS_ITEM_SYSITEMS )
Lines 312-317 Link Here
312	else if ( pTopic->aItem == SZDDESYS_ITEM_FORMATS )	331	else if ( pTopic->aItem == SZDDESYS_ITEM_FORMATS )
313	aRes = pService->Formats();	332	aRes = pService->Formats();
314	else if ( pTopic->aItem == SZDDESYS_ITEM_HELP )	333	else if ( pTopic->aItem == SZDDESYS_ITEM_HELP )
		334	#endif
315	aRes = pService->GetHelp();	335	aRes = pService->GetHelp();
316	else	336	else
317	aRes = pService->SysTopicGet( pTopic->aItem );	337	aRes = pService->SysTopicGet( pTopic->aItem );
Lines 455-461 Link Here
455	// dann befragen wir doch mal unsere Ableitung:	475	// dann befragen wir doch mal unsere Ableitung:
456	TCHAR chBuf[250];	476	TCHAR chBuf[250];
457	DdeQueryString(pInst->hDdeInstSvr,hTopic,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );	477	DdeQueryString(pInst->hDdeInstSvr,hTopic,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );
		478	#ifdef __MINGW32__
		479	bWeiter = rService.MakeTopic( reinterpret_cast< const unsigned short int * >(chBuf) );
		480	#else
458	bWeiter = rService.MakeTopic( chBuf );	481	bWeiter = rService.MakeTopic( chBuf );
		482	#endif
459	// dann muessen wir noch mal suchen	483	// dann muessen wir noch mal suchen
460	} while( bWeiter );	484	} while( bWeiter );
461		485
Lines 485-491 Link Here
485	// dann befragen wir doch mal unsere Ableitung:	509	// dann befragen wir doch mal unsere Ableitung:
486	TCHAR chBuf[250];	510	TCHAR chBuf[250];
487	DdeQueryString(pInst->hDdeInstSvr,hItem,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );	511	DdeQueryString(pInst->hDdeInstSvr,hItem,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE );
		512	#ifdef __MINGW32__
		513	bWeiter = rTopic.MakeItem( reinterpret_cast< unsigned short int * >(chBuf) );
		514	#else
488	bWeiter = rTopic.MakeItem( chBuf );	515	bWeiter = rTopic.MakeItem( chBuf );
		516	#endif
489	// dann muessen wir noch mal suchen	517	// dann muessen wir noch mal suchen
490	} while( bWeiter );	518	} while( bWeiter );
491		519
Lines 526-537 Link Here
526	nStatus = DMLERR_SYS_ERROR;	554	nStatus = DMLERR_SYS_ERROR;
527		555
528	AddFormat( FORMAT_STRING );	556	AddFormat( FORMAT_STRING );
		557	#ifdef __MINGW32__
		558	pSysTopic = new DdeTopic( reinterpret_cast< const unsigned short int * >(SZDDESYS_TOPIC) );
		559	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_TOPICS) ) );
		560	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_SYSITEMS) ) );
		561	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_STATUS) ) );
		562	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_FORMATS) ) );
		563	pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_HELP) ) );
		564	#else
529	pSysTopic = new DdeTopic( SZDDESYS_TOPIC );	565	pSysTopic = new DdeTopic( SZDDESYS_TOPIC );
530	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_TOPICS ) );	566	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_TOPICS ) );
531	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_SYSITEMS ) );	567	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_SYSITEMS ) );
532	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_STATUS ) );	568	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_STATUS ) );
533	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_FORMATS ) );	569	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_FORMATS ) );
534	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_HELP ) );	570	pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_HELP ) );
		571	#endif
535	AddTopic( *pSysTopic );	572	AddTopic( *pSysTopic );
536	}	573	}
537		574
Lines 683-689 Link Here
683		720
684	BOOL DdeTopic::IsSystemTopic()	721	BOOL DdeTopic::IsSystemTopic()
685	{	722	{
		723	#ifdef __MINGW32__
		724	return BOOL (GetName() == reinterpret_cast< const unsigned short int * >(SZDDESYS_TOPIC));
		725	#else
686	return BOOL (GetName() == SZDDESYS_TOPIC);	726	return BOOL (GetName() == SZDDESYS_TOPIC);
		727	#endif
687	}	728	}
688		729
689	// --- DdeTopic::AddItem() -----------------------------------------	730	// --- DdeTopic::AddItem() -----------------------------------------
Lines 1049-1056 Link Here
1049	{	1090	{
1050	String s;	1091	String s;
1051	long f;	1092	long f;
		1093	#ifdef __MINGW32__
		1094	unsigned short int buf[128];
		1095	const unsigned short int * p;
		1096	#else
1052	TCHAR buf[128];	1097	TCHAR buf[128];
1053	LPCTSTR p;	1098	LPCTSTR p;
		1099	#endif
1054	short n = 0;	1100	short n = 0;
1055		1101
1056	for ( f = aFormats.First(); f; f = aFormats.Next(), n++ )	1102	for ( f = aFormats.First(); f; f = aFormats.Next(), n++ )
Lines 1087-1094 Link Here
1087	p= String::CreateFromAscii("PRIVATE").GetBuffer();	1133	p= String::CreateFromAscii("PRIVATE").GetBuffer();
1088	#else	1134	#else
1089	default:	1135	default:
		1136	#ifdef __MINGW32__
		1137	GetClipboardFormatName( (UINT)f, reinterpret_cast< LPTSTR >(buf), sizeof(buf) / sizeof(TCHAR) );
		1138	#else
1090	GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) );	1139	GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) );
1091	#endif	1140	#endif
		1141	#endif
1092	}	1142	}
1093	s += String( p );	1143	s += String( p );
1094	}	1144	}

Lines 59-69 Link Here

(-)./svtools/source/filter.vcl/jpeg/jpeg.cxx.orig (-5 / +5 lines)
59	*	59	*
60	************************************************************************/	60	************************************************************************/
61		61
62	extern "C"
63	{
64	#include "jpeg.h"
65	}
66
67	#define _JPEGPRIVATE	62	#define _JPEGPRIVATE
68		63
69	#include <tools/new.hxx>	64	#include <tools/new.hxx>
Lines 72-77 Link Here
72	#include "FilterConfigItem.hxx"	67	#include "FilterConfigItem.hxx"
73	#include "filter.hxx"	68	#include "filter.hxx"
74		69
		70	extern "C"
		71	{
		72	#include "jpeg.h"
		73	}
		74
75	// -----------	75	// -----------
76	// - Defines -	76	// - Defines -
77	// -----------	77	// -----------

Lines 39-44 Link Here

(-)./svtools/prj/d.lst.orig (+2 lines)
39	..\%__SRC%\misc\svt?????.map %_DEST%\bin%_EXT%\svt?????.map	39	..\%__SRC%\misc\svt?????.map %_DEST%\bin%_EXT%\svt?????.map
40	..\%__SRC%\lib\libsvt?????.so %_DEST%\lib%_EXT%\*	40	..\%__SRC%\lib\libsvt?????.so %_DEST%\lib%_EXT%\*
41	..\%__SRC%\lib\libsvl?????.so %_DEST%\lib%_EXT%\*	41	..\%__SRC%\lib\libsvl?????.so %_DEST%\lib%_EXT%\*
		42	..\%__SRC%\lib\libsvt?????.a %_DEST%\lib%_EXT%\*
		43	..\%__SRC%\lib\libsvl?????.a %_DEST%\lib%_EXT%\*
42	..\%__SRC%\lib\libsv.dylib %_DEST%\lib%_EXT%\	44	..\%__SRC%\lib\libsv.dylib %_DEST%\lib%_EXT%\
43	..\%__SRC%\misc\svtools.hid %_DEST%\bin%_EXT%\svtools.hid	45	..\%__SRC%\misc\svtools.hid %_DEST%\bin%_EXT%\svtools.hid
44	..\%__SRC%\inc\svtools\proped.hxx %_DEST%\inc%_EXT%\svtools\proped.hxx	46	..\%__SRC%\inc\svtools\proped.hxx %_DEST%\inc%_EXT%\svtools\proped.hxx

Lines 112-118 Link Here

(-)./tools/symbol/symbol.cxx.orig (+8 lines)
112		112
113	pMap[nSize] = '\0';	113	pMap[nSize] = '\0';
114	#else	114	#else
		115	#ifdef __MINGW32__
		116	SvFileStream aMap( String( *(argv+1), gsl_getSystemTextEncoding()), STREAM_READ ); // gcc bug??
		117	#else
115	SvFileStream aMap( String( argv[1], gsl_getSystemTextEncoding()), STREAM_READ );	118	SvFileStream aMap( String( argv[1], gsl_getSystemTextEncoding()), STREAM_READ );
		119	#endif
116		120
117	nSize = aMap.Seek( STREAM_SEEK_TO_END );	121	nSize = aMap.Seek( STREAM_SEEK_TO_END );
118	if( aMap.GetError() )	122	if( aMap.GetError() )
Lines 159-165 Link Here
159	if( n != nLines )	163	if( n != nLines )
160	return Error( 5, "n", n );	164	return Error( 5, "n", n );
161		165
		166	#ifdef __MINGW32__
		167	SvFileStream aLeak( String( *(argv+2), gsl_getSystemTextEncoding()), STREAM_READ );
		168	#else
162	SvFileStream aLeak( String( argv[2], gsl_getSystemTextEncoding()), STREAM_READ );	169	SvFileStream aLeak( String( argv[2], gsl_getSystemTextEncoding()), STREAM_READ );
		170	#endif
163	ByteString aLine;	171	ByteString aLine;
164		172
165	aLeak.ReadLine( aLine );	173	aLeak.ReadLine( aLine );

Lines 2313-2319 Link Here

(-)./tools/source/fsys/dirent.cxx.orig (-1 / +1 lines)
2313	/* Prefix can have 5 chars, leaving 3 for numbers.	2313	/* Prefix can have 5 chars, leaving 3 for numbers.
2314	26 ** 3 == 17576	2314	26 ** 3 == 17576
2315	*/	2315	*/
2316	#if (defined (MSC) \|\| defined (BLC) \|\| defined(ICC) ) && ( defined (WIN) \|\| defined (WNT))	2316	#if (defined (MSC) \|\| defined (BLC) \|\| defined(ICC) \|\| defined(__MINGW32__)) && ( defined (WIN) \|\| defined (WNT))
2317	static unsigned long u = GetTickCount();	2317	static unsigned long u = GetTickCount();
2318	#else	2318	#else
2319	static unsigned long u = clock();	2319	static unsigned long u = clock();

Lines 98-105 Link Here

(-)./tools/source/fsys/comdep.hxx.orig (+4 lines)
98	#else	98	#else
99		99
100	#if defined( WNT ) && !defined( WTC )	100	#if defined( WNT ) && !defined( WTC )
		101	#ifdef __MINGW32__
		102	#include "wntgcc.hxx"
		103	#else
101	#include "wntmsc.hxx"	104	#include "wntmsc.hxx"
102	#endif	105	#endif
		106	#endif
103		107
104	#ifdef UNX	108	#ifdef UNX
105	#include "unx.hxx"	109	#include "unx.hxx"

Lines 111-117 Link Here

(-)./tools/source/fsys/wntgcc.hxx.orig (-1 / +1 lines)
111	#define PATHDELIMITER ";"	111	#define PATHDELIMITER ";"
112	#define DEFSTYLE FSYS_STYLE_NTFS	112	#define DEFSTYLE FSYS_STYLE_NTFS
113	#define MKDIR( p ) mkdir( p )	113	#define MKDIR( p ) mkdir( p )
114	#define CMP_LOWER(s) ( ByteString(s).ToLowerAscii() )	114	#define CMP_LOWER(s) (s)
115		115
116	#include <svwin.h>	116	#include <svwin.h>
117	#define START_DRV 'a'	117	#define START_DRV 'a'

Lines 101-107 Link Here

(-)./tools/inc/solar.h.orig (-1 / +1 lines)
101	typedef char INT8;	101	typedef char INT8;
102	typedef unsigned char UINT8;	102	typedef unsigned char UINT8;
103	#else	103	#else
104	#if !defined(_MSC_VER) \|\| defined(_MSC_VER) && (_MSC_VER < 1200) \|\| (_MSC_VER >= 1200 ) && !defined(VCL_NEED_BASETSD )	104	#if !defined(__MINGW32__) && !defined(_MSC_VER) \|\| defined(_MSC_VER) && (_MSC_VER < 1200) \|\| ( (_MSC_VER >= 1200 ) \|\| defined(__MINGW32__) ) && !defined(VCL_NEED_BASETSD )
105	typedef void INT64;	105	typedef void INT64;
106	typedef void UINT64;	106	typedef void UINT64;
107	typedef long INT32;	107	typedef long INT32;

Lines 64-70 Link Here

(-)./vos/source/signal.cxx.orig (-1 / +1 lines)
64	#include <vos/object.hxx>	64	#include <vos/object.hxx>
65	#include <vos/signal.hxx>	65	#include <vos/signal.hxx>
66		66
67	#if defined ( _USE_NAMESPACE ) && !defined ( WNT )	67	#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(__MINGW32__))
68		68
69	oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo)	69	oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo)
70	{	70	{

Lines 68-74 Link Here

(-)./vos/source/thread.cxx.orig (-1 / +1 lines)
68		68
69		69
70		70
71	#if defined ( _USE_NAMESPACE ) && !defined ( WNT )	71	#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(GCC))
72		72
73	void _OThread_WorkerFunction(void* pthis)	73	void _OThread_WorkerFunction(void* pthis)
74	{	74	{

Lines 80-86 Link Here

(-)./vos/inc/vos/signal.hxx.orig (-2 / +2 lines)
80	{	80	{
81	#endif	81	#endif
82		82
83	#if defined ( _USE_NAMESPACE ) && !defined ( WNT )	83	#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(__MINGW32__))
84	oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);	84	oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);
85	#endif	85	#endif
86		86
Lines 133-139 Link Here
133	protected:	133	protected:
134	oslSignalHandler m_hHandler;	134	oslSignalHandler m_hHandler;
135		135
136	#if defined ( _USE_NAMESPACE ) && defined ( WNT )	136	#if defined ( _USE_NAMESPACE ) && (defined ( WNT ) && !defined(__MINGW32__))
137	friend oslSignalAction SAL_CALL ::_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);	137	friend oslSignalAction SAL_CALL ::_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);
138	#elif defined ( _USE_NAMESPACE )	138	#elif defined ( _USE_NAMESPACE )
139	friend oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);	139	friend oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo);

Lines 431-437 Link Here

(-)./registry/tools/checksingleton.cxx.orig (-1 / +1 lines)
431	return bRet;	431	return bRet;
432	}	432	}
433		433
434	#if (defined UNX) \|\| (defined OS2)	434	#if (defined UNX) \|\| (defined OS2) \|\| (defined __MINGW32__)
435	int main( int argc, char * argv[] )	435	int main( int argc, char * argv[] )
436	#else	436	#else
437		437

Lines 2102-2108 Link Here

(-)./registry/tools/regcompare.cxx.orig (-1 / +1 lines)
2102	return nError;	2102	return nError;
2103	}	2103	}
2104		2104
2105	#if (defined UNX) \|\| (defined OS2)	2105	#if (defined UNX) \|\| (defined OS2) \|\| defined __MINGW32__
2106	int main( int argc, char * argv[] )	2106	int main( int argc, char * argv[] )
2107	#else	2107	#else
2108		2108

Lines 68-73 Link Here

(-)./registry/source/regimpl.cxx.orig (+3 lines)
68	#ifdef UNX	68	#ifdef UNX
69	#include <unistd.h>	69	#include <unistd.h>
70	#endif	70	#endif
		71	#ifdef __MINGW32__
		72	#include <unistd.h>
		73	#endif
71		74
72	#ifdef MACOSX	75	#ifdef MACOSX
73	// Get the store.hxx inlines non-inline, solves crashes in cppumaker	76	// Get the store.hxx inlines non-inline, solves crashes in cppumaker

Lines 8-13 Link Here

(-)./registry/prj/d.lst.orig (+1 lines)
8	..\%__SRC%\lib\libreg.so. %_DEST%\lib%_EXT%\libreg.so.	8	..\%__SRC%\lib\libreg.so. %_DEST%\lib%_EXT%\libreg.so.
9	..\%__SRC%\lib\librgt.so %_DEST%\lib%_EXT%\librgt.so	9	..\%__SRC%\lib\librgt.so %_DEST%\lib%_EXT%\librgt.so
10	..\%__SRC%\bin\reg.dll %_DEST%\bin%_EXT%\reg.dll	10	..\%__SRC%\bin\reg.dll %_DEST%\bin%_EXT%\reg.dll
		11	..\%__SRC%\lib\libreg.a %_DEST%\lib%_EXT%\libreg.a
11	..\%__SRC%\lib\libreg.dylib %_DEST%\lib%_EXT%\libreg.dylib	12	..\%__SRC%\lib\libreg.dylib %_DEST%\lib%_EXT%\libreg.dylib
12	..\%__SRC%\lib\libreg.dylib. %_DEST%\lib%_EXT%\libreg.dylib.	13	..\%__SRC%\lib\libreg.dylib. %_DEST%\lib%_EXT%\libreg.dylib.
13		14

Lines 2-7 Link Here

(-)./stoc/prj/d.lst.orig (+1 lines)
2		2
3	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\	3	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\
4	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\	4	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\
		5	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\
5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	6	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
6		7
7	..\%__SRC%\bin\.rdb %_DEST%\rdb%_EXT%\	8	..\%__SRC%\bin\.rdb %_DEST%\rdb%_EXT%\

Lines 5-10 Link Here

(-)./remotebridges/prj/d.lst.orig (+1 lines)
5	..\source\dynamicloader\dynamicloader.xml %_DEST%\xml%_EXT%\dynamicloader.uno.xml	5	..\source\dynamicloader\dynamicloader.xml %_DEST%\xml%_EXT%\dynamicloader.uno.xml
6	..\source\unourl_resolver\uuresolver.xml %_DEST%\xml%_EXT%\uuresolver.uno.xml	6	..\source\unourl_resolver\uuresolver.xml %_DEST%\xml%_EXT%\uuresolver.uno.xml
7	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\	7	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\
		8	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\
8	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\	9	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\
9		10
10	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib	11	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib




	// return
	typelib_TypeDescription * pReturnTypeDescr = 0;
	if (pReturnTypeRef)
    {
		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
    }

	void * pUnoReturn = 0;
	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need

	if (pReturnTypeDescr)
	{
		if (cppu_isSimpleType( pReturnTypeDescr ))

		{
			pCppReturn = *(void **)pCppStack;
			pCppStack += sizeof(void *);

			pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
						  ? alloca( pReturnTypeDescr->nSize )
						  : pCppReturn); // direct way

	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
	// type descriptions for reconversions
	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));

	sal_Int32 nTempIndizes = 0;

	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
	{
		const typelib_MethodParameter & rParam = pParams[nPos];

			// is in/inout
			else if (cppu_relatesToInterface( pParamTypeDescr ))
			{
				::uno_copyAndConvertData(
                    pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                    *(void **)pCppStack, pParamTypeDescr,
                    &pThis->pBridge->aCpp2Uno );
				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
				// will be released at reconversion
				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;

		}
		pCppStack += sizeof(sal_Int32); // standard parameter length
	}

	// ExceptionHolder
	uno_Any aUnoExc; // Any will be constructed by callee
	uno_Any * pUnoExc = &aUnoExc;

	// invoke uno dispatch call
	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );

	// in case an exception occured...
	if (pUnoExc)
	{
		// destruct temporary in/inout params
		while (nTempIndizes--)
		{
			sal_Int32 nIndex = pTempIndizes[nTempIndizes];

			if (pParams[nIndex].bIn) // is in/inout => was constructed
            {
				::uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
            }
			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
		}
		if (pReturnTypeDescr)
        {
			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
        }

		raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
		// is here for dummy
		return typelib_TypeClass_VOID;

	else // else no exception occured...
	{
		// temporary params
		while (nTempIndizes--)
		{
			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];

			if (pParams[nIndex].bOut) // inout/out
			{
				// convert and assign
				::uno_destructData(
                    pCppArgs[nIndex], pParamTypeDescr, cpp_release );
				::uno_copyAndConvertData(
                    pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
                    &pThis->pBridge->aUno2Cpp );
			}
			// destroy temp uno param
			::uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );

			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
		}
		// return

		{
			if (pUnoReturn != pCppReturn) // needs reconversion
			{
				::uno_copyAndConvertData(
                    pCppReturn, pUnoReturn, pReturnTypeDescr,
                    &pThis->pBridge->aUno2Cpp );
				// destroy temp uno return
				::uno_destructData(
                    pUnoReturn, pReturnTypeDescr, 0 );
			}
			// complex return ptr is set to eax
			*(void **)pRegisterReturn = pCppReturn;

	sal_Int64 * pRegisterReturn /* space for register return */ )
{
	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );

	// pCallStack: ret adr, [ret *], this, params
	// _this_ ptr is patched cppu_XInterfaceProxy object
	cppu_cppInterfaceProxy * pThis = NULL;
	if( nVtableCall & 0x80000000 )
	{
		nVtableCall &= 0x7fffffff;
		pThis = static_cast< cppu_cppInterfaceProxy * >(
		reinterpret_cast< XInterface * >( pCallStack[2] ) );
	}
	else
    {
		pThis = static_cast< cppu_cppInterfaceProxy * >(
		reinterpret_cast< XInterface * >( pCallStack[1] ) );
    }
    
	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
	
	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
	{
		throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!") ),
								(XInterface *)pThis );
            (XInterface *)pCppI );
	}

	// determine called method
	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );

	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );

	typelib_TypeClass eRet;
	switch (aMemberDescr.get()->eTypeClass)
	{

		{
			// is GET method
			eRet = cpp2uno_call(
				pThis, aMemberDescr.get(),
				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
				0, 0, // no params
				pCallStack, pRegisterReturn );

				((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
			aParam.bIn		= sal_True;
			aParam.bOut		= sal_False;

			eRet = cpp2uno_call(
				pThis, aMemberDescr.get(),
				0, // indicates void return
				1, &aParam,
				pCallStack, pRegisterReturn );

		// is METHOD
		switch (nVtableCall)
		{
			// standard XInterface vtable calls
		case 1: // acquire()
			pThis->acquireProxy(); // non virtual call!
			eRet = typelib_TypeClass_VOID;
			break;
		case 2: // release()
			pThis->releaseProxy(); // non virtual call!
			eRet = typelib_TypeClass_VOID;
			break;
		case 0: // queryInterface() opt

			typelib_TypeDescription * pTD = 0;
			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
			if (pTD)
            {
                XInterface * pInterface = 0;
                (*pThis->pBridge->pCppEnv->getRegisteredInterface)(
                    pThis->pBridge->pCppEnv,
                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );

                if (pInterface)
                {
                    ::uno_any_construct(

		} // else perform queryInterface()
		default:
			eRet = cpp2uno_call(
				pThis, aMemberDescr.get(),
				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
				((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,

	default:
	{
		throw RuntimeException(
			OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ),
			(XInterface *)pThis );
		// is here for dummy
		eRet = typelib_TypeClass_VOID;
	}


//==================================================================================================
void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
	XInterface * pThis, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
{
	static MediateClassData * s_pMediateClassData = 0;
	if (! s_pMediateClassData)

#endif
		}
	}
	*(void const **)pThis = s_pMediateClassData->get_vtable( pTypeDescr );
}

}

sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
	SAL_THROW_EXTERN_C()
{
	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
        &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
}
//##################################################################################################
void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
	SAL_THROW_EXTERN_C()
{
	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
        pCppEnv );
}
//##################################################################################################
void SAL_CALL uno_ext_getMapping(
	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
	SAL_THROW_EXTERN_C()
{
	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
        ppMapping, pFrom, pTo );
}
}




	sal_Int32 nParams, typelib_MethodParameter * pParams,
	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
{
	// max space for: [complex ret ptr], values|ptr ...
	char * pCppStack		= (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
	char * pCppStackStart	= pCppStack;
  	char * pCppStackStart	= pCppStack;
	
	// return
	typelib_TypeDescription * pReturnTypeDescr = 0;

	pCppStack += sizeof( void* );

	// stack space

	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
	// args
	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );

		
		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
		{
			::uno_copyAndConvertData(
                pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                &pThis->pBridge->aUno2Cpp );
			
			switch (pParamTypeDescr->eTypeClass)
			{

			if (! rParam.bIn) // is pure out
			{
				// cpp out is constructed mem, uno out is not!
				::uno_constructData(
					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
					pParamTypeDescr );
				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call

			// is in/inout
			else if (cppu_relatesToInterface( pParamTypeDescr ))
			{
				::uno_copyAndConvertData(
					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
					pUnoArgs[nPos], pParamTypeDescr,
					&pThis->pBridge->aUno2Cpp );
				
				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
				// will be released at reconversion


	try
	{
			OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
			callVirtualMethod(
				pThis->pCppI, nVtableCall,
				pCppReturn, pReturnTypeDescr->eTypeClass,
				(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
		// NO exception occured...
		*ppUnoExc = 0;
		
		// reconvert temporary params
		for ( ; nTempIndizes--; )
		{
			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
			
			// NO exception occured...
			*ppUnoExc = 0;
			
			// reconvert temporary params
			while (nTempIndizes--)
			{
				sal_Int32 nIndex = pTempIndizes[nTempIndizes];
				typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
				
				if (pParams[nIndex].bIn)
				{
					if (pParams[nIndex].bOut) // inout
					{
						::uno_destructData(
                            pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
						::uno_copyAndConvertData(
                            pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
                            &pThis->pBridge->aCpp2Uno );
					}
				}
				else // pure out
				{
					::uno_copyAndConvertData(
                        pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
                        &pThis->pBridge->aCpp2Uno );
				}
				// destroy temp cpp param => cpp: every param was constructed
				::uno_destructData(
                    pCppArgs[nIndex], pParamTypeDescr, cpp_release );
				
				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
			}
			// return value
			if (pCppReturn && pUnoReturn != pCppReturn)
			{
				::uno_copyAndConvertData(
                    pUnoReturn, pCppReturn, pReturnTypeDescr,
                    &pThis->pBridge->aCpp2Uno );
				::uno_destructData(
                    pCppReturn, pReturnTypeDescr, cpp_release );
			}
			// destroy temp cpp param => cpp: every param was constructed
			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
			
			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
		}
		// return value
		if (pCppReturn && pUnoReturn != pCppReturn)
		{
			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
									&pThis->pBridge->aCpp2Uno );
			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
		}
	}
 	catch (...)
 	{
  		// fill uno exception
		fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
        
		// temporary params
		for ( ; nTempIndizes--; )
		{
			// temporary params
			while (nTempIndizes--)
			{
				sal_Int32 nIndex = pTempIndizes[nTempIndizes];
				// destroy temp cpp param => cpp: every param was constructed
				::uno_destructData(
                    pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
				TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
			}
		}
		// return type
		if (pReturnTypeDescr)
        {
			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
        }
	}
}


//==================================================================================================
void SAL_CALL cppu_unoInterfaceProxy_dispatch(
	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
{
	// is my surrogate
	cppu_unoInterfaceProxy * pThis = static_cast< cppu_unoInterfaceProxy * >( pUnoI );
	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
	
	switch (pMemberDescr->eTypeClass)

				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
			aParam.bIn		= sal_True;
			aParam.bOut		= sal_False;
			
			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
			typelib_typedescriptionreference_new(

			typelib_TypeDescription * pTD = 0;
			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
			if (pTD)
            {
                uno_Interface * pInterface = 0;
                (*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
                    pThis->pBridge->pUnoEnv,

Lines 5-10 Link Here

(-)./bridges/prj/build.lst.orig (+1 lines)
5	br bridges\source\remote\urp nmake - all br_rem_urp br_rem_static NULL	5	br bridges\source\remote\urp nmake - all br_rem_urp br_rem_static NULL
6	br bridges\source\remote\iiop nmake - all br_iiop br_rem_static NULL	6	br bridges\source\remote\iiop nmake - all br_iiop br_rem_static NULL
7	br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL	7	br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
		8	br bridges\source\cpp_uno\mingw_intel nmake - w br_gcc3i br_unotypes NULL
8	br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL	9	br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
9	br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL	10	br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
10	br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL	11	br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL

Lines 1-6 Link Here

(-)./jurt/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar	1	..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar
2	..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll	2	..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll
3	..\%__SRC%\lib\libjpipe.so %_DEST%\lib%_EXT%\libjpipe.so	3	..\%__SRC%\lib\libjpipe.so %_DEST%\lib%_EXT%\libjpipe.so
		4	..\%__SRC%\lib\libjpipe.a %_DEST%\lib%_EXT%\libjpipe.a
4	..\%__SRC%\lib\libjpipe.dylib %_DEST%\lib%_EXT%\libjpipe.dylib	5	..\%__SRC%\lib\libjpipe.dylib %_DEST%\lib%_EXT%\libjpipe.dylib
5		6
6	..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip	7	..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip

Lines 1-6 Link Here

(-)./javaunohelper/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar	1	..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar
2	..\%__SRC%\bin\juh.dll %_DEST%\bin%_EXT%\juh.dll	2	..\%__SRC%\bin\juh.dll %_DEST%\bin%_EXT%\juh.dll
3	..\%__SRC%\lib\libjuh.so %_DEST%\lib%_EXT%\libjuh.so	3	..\%__SRC%\lib\libjuh.so %_DEST%\lib%_EXT%\libjuh.so
		4	..\%__SRC%\lib\libjuh.a %_DEST%\lib%_EXT%\libjuh.a
4	..\%__SRC%\lib\libjuh.dylib %_DEST%\lib%_EXT%\libjuh.dylib	5	..\%__SRC%\lib\libjuh.dylib %_DEST%\lib%_EXT%\libjuh.dylib
5		6
6	..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip	7	..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip

Lines 1-5 Link Here

(-)./ucbhelper/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		3	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
3	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib	4	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib
4	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib	5	..\%__SRC%\lib\.lib %_DEST%\lib%_EXT%\.lib
5	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map	6	..\%__SRC%\misc\.map %_DEST%\bin%_EXT%\.map

Lines 42-48 Link Here

(-)./config_office/set_soenv.in.orig (-23 / +196 lines)
42	my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,	42	my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
43	$par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGW,	43	$par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGW,
44	$platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_include,	44	$platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_include,
45	$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os);	45	$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, $comver, $mingw_format_var, %lib_include_paths, $lib_include_path);
46	#	46	#
47	#-------------------------------------------------	47	#-------------------------------------------------
48	# IIb. Declaring environment values (constants).	48	# IIb. Declaring environment values (constants).
Lines 88-94 Link Here
88	$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,	88	$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
89	$TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,	89	$TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
90	$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $ENABLE_STATIC_GTK,	90	$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $ENABLE_STATIC_GTK,
91	$PYTHONPATH, $PYTHONHOME );	91	$PYTHONPATH, $PYTHONHOME, $GXX_INCLUDE_PATH);
92	#	92	#
93	#-------------------------------------------	93	#-------------------------------------------
94	# IId. Declaring the aliases.	94	# IId. Declaring the aliases.
Lines 138-143 Link Here
138	$ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries	138	$ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries
139	$WRAPCMD = ""; # Wrapper (only for winnt)	139	$WRAPCMD = ""; # Wrapper (only for winnt)
140	$GLIBC = ""; # Whether the platform uses glibc	140	$GLIBC = ""; # Whether the platform uses glibc
		141	$GXX_INCLUDE_PATH = '@GXX_INCLUDE_PATH@';
		142	chomp( $GXX_INCLUDE_PATH = qx{cygpath "$GXX_INCLUDE_PATH"} );
141		143
142	#	144	#
143	#--------------------------------------------------------------------	145	#--------------------------------------------------------------------
Lines 516-524 Link Here
516	if ( $MINGW eq "yes" )	518	if ( $MINGW eq "yes" )
517	{ # At the moment this implies the use of tcsh	519	{ # At the moment this implies the use of tcsh
518	print "Setting Windows NT cygwin MinGW specific values... ";	520	print "Setting Windows NT cygwin MinGW specific values... ";
519	$WRAPCMD = "guw.pl";	521	$WRAPCMD = "gum.pl";
520	$outfile = "winmingw.set";	522	$outfile = "winmingw.set";
521	$COM = "GCC";	523	$COM = "GCC";
		524	# COMPATH for MSC is differently used
		525	$COMPATH =~ s/\/bin$//i;
522	$CVER = "C300";	526	$CVER = "C300";
523	$DLLSUFFIX = "gi";	527	$DLLSUFFIX = "gi";
524	$OUTPATH = "wntgcci";	528	$OUTPATH = "wntgcci";
Lines 536-548 Link Here
536	$INPATH = $OUTPATH.$PROEXT;	540	$INPATH = $OUTPATH.$PROEXT;
537	$GVERDIR = $INPATH;	541	$GVERDIR = $INPATH;
538	$COMEX = '@COMEX@';	542	$COMEX = '@COMEX@';
539	if ( "@COMEX@" eq "8" )	543	if ( "@COMEX@" eq "10" )
540	{ # .NET needs M1300	544	{ # .NET 2003 needs M1310
541	$CVER = "M1300";	545	$CVER = "M1310";
542	}	546	}
543	else	547	else
544	{ # keep the historical value for MSVC 6	548	{
545	$CVER = "MI200";	549	if ( "@COMEX@" eq "8" )
		550	{ # .NET needs M1300
		551	$CVER = "M1300";
		552	}
		553	else
		554	{ # keep the historical value for MSVC 6
		555	$CVER = "MI200";
		556	}
546	}	557	}
547		558
548	if ( "@USE_SHELL@" ne "4nt" )	559	if ( "@USE_SHELL@" ne "4nt" )
Lines 956-966 Link Here
956	elsif ($platform eq "$Winnt")	967	elsif ($platform eq "$Winnt")
957	{ $SOLARINCLUDES = $I.$SOLARVER.$INC.	968	{ $SOLARINCLUDES = $I.$SOLARVER.$INC.
958	$I.$SOLARENV.$ds.$INPATH.$INC.	969	$I.$SOLARENV.$ds.$INPATH.$INC.
959	$I.$SOLARENV.$INC.	970	$I.$SOLARENV.$INC;
960	$I."'".$PSDK_HOME.$INCLUDE."'";
961	# Mingw is different	971	# Mingw is different
962	if ( $COM eq "MSC" )	972	if ( $COM eq "MSC" )
		973	{ $SOLARINCLUDES .= $I."'".$PSDK_HOME.$INCLUDE."'".
		974	$I.'$COMPATH'.$ds."include";
		975	}
		976	else
963	{ $SOLARINCLUDES .= $I.'$COMPATH'.$ds."include";	977	{ $SOLARINCLUDES .= $I.'$COMPATH'.$ds."include";
		978	%lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" );
		979	foreach $lib_include_path (%lib_include_paths)
		980	{ chomp( $lib_include_path = qx{cygpath $lib_include_path} );
		981	if ( $lib_include_path ne $COMPATH.$ds."include" )
		982	{
		983	$SOLARINCLUDES .= $I.$lib_include_path;
		984	}
		985	}
		986	$SOLARINCLUDES .= $I.$GXX_INCLUDE_PATH.$I.$GXX_INCLUDE_PATH.$ds."mingw32".
		987	$I."'".$PSDK_HOME.$INCLUDE."'";
964	}	988	}
965	}	989	}
966	elsif ($platform eq "$Macosx")	990	elsif ($platform eq "$Macosx")
Lines 982-1001 Link Here
982	$IENV = $cur_dir.	1006	$IENV = $cur_dir.
983	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.	1007	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.
984	$ps.$SOLARENV.$ds.$OUTPATH.$INC.	1008	$ps.$SOLARENV.$ds.$OUTPATH.$INC.
985	$ps.$SOLARENV.$INC.	1009	$ps.$SOLARENV.$INC;
986	$ps.'$PSDK_HOME'.$INCLUDE;
987	# Mingw is different	1010	# Mingw is different
988	if ( $COM eq "MSC" )	1011	if ( $COM eq "MSC" )
		1012	{ $IENV .= $ps.'$PSDK_HOME'.$INCLUDE.
		1013	$ps.'$COMPATH'.$INCLUDE;
		1014	}
		1015	else
989	{ $IENV .= $ps.'$COMPATH'.$INCLUDE;	1016	{ $IENV .= $ps.'$COMPATH'.$INCLUDE;
		1017	%lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" );
		1018	foreach $lib_include_path (%lib_include_paths)
		1019	{ chomp( $lib_include_path = qx{cygpath $lib_include_path} );
		1020	if ( $lib_include_path ne $COMPATH.$ds."include" )
		1021	{
		1022	$IENV .= $ps.$lib_include_path;
		1023	}
		1024	}
		1025	$IENV .= $ps.$GXX_INCLUDE_PATH.$ps.$GXX_INCLUDE_PATH.$ds."mingw32".
		1026	$ps.'$PSDK_HOME'.$INCLUDE;
990	}	1027	}
991	$WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps.	1028	$WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps.
992	$ps.$SOLARVER.$ds.$UPD.$LIB.	1029	$ps.$SOLARVER.$ds.$UPD.$LIB.
993	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.	1030	$ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.
994	$ps.$SOLARENV.$ds.$OUTPATH.$LIB.	1031	$ps.$SOLARENV.$ds.$OUTPATH.$LIB.
995	$ps.$JAVA_HOME.$LIB.	1032	$ps.$JAVA_HOME.$LIB;
996	$ps.'$PSDK_HOME'.$LIB;
997	# Mingw is different	1033	# Mingw is different
998	if ( $COM eq "MSC" )	1034	if ( $COM eq "MSC" )
		1035	{ $WIN_LIB .= $ps.'$PSDK_HOME'.$LIB.
		1036	$ps.'$COMPATH'.$LIB;
		1037	}
		1038	else
999	{ $WIN_LIB .= $ps.'$COMPATH'.$LIB;	1039	{ $WIN_LIB .= $ps.'$COMPATH'.$LIB;
1000	}	1040	}
1001	if ( $JAVA_HOME ne "" )	1041	if ( $JAVA_HOME ne "" )
Lines 1081-1087 Link Here
1081	if ( $COM eq "MSC" ) {	1121	if ( $COM eq "MSC" ) {
1082	$PATH .= $ps.'$COMPATH'.$BIN;	1122	$PATH .= $ps.'$COMPATH'.$BIN;
1083	} else {	1123	} else {
1084	$PATH .= $ps.'$COMPATH';	1124	$PATH .= $ps.'$COMPATH'.$BIN;
1085	}	1125	}
1086	}	1126	}
1087	if ( $COM eq "MSC" ) {	1127	if ( $COM eq "MSC" ) {
Lines 1092-1098 Link Here
1092	if ( $noldPATH !~ /(?:[:]\|\A)(?:$MSPDB_PATH)(?:[:]\|\Z)/ ) {	1132	if ( $noldPATH !~ /(?:[:]\|\A)(?:$MSPDB_PATH)(?:[:]\|\Z)/ ) {
1093	$PATH .= $ps.$MSPDB_PATH;	1133	$PATH .= $ps.$MSPDB_PATH;
1094	}	1134	}
1095	if ( $COMEX eq "8" ) {	1135	if ( $COMEX eq "8" \|\| $COMEX eq "10" ) {
1096	# .NET needs midl.exe	1136	# .NET needs midl.exe
1097	if ( $noldPATH !~ /(?:[:]\|\A)(?:$MIDL_PATH)(?:[:]\|\Z)/ ) {	1137	if ( $noldPATH !~ /(?:[:]\|\A)(?:$MIDL_PATH)(?:[:]\|\Z)/ ) {
1098	$PATH .= $ps.$MIDL_PATH;	1138	$PATH .= $ps.$MIDL_PATH;
Lines 1281-1291 Link Here
1281	elsif ($platform eq "$Winnt")	1321	elsif ($platform eq "$Winnt")
1282	{ $SOLARINC .= $STLPORT_stlport.	1322	{ $SOLARINC .= $STLPORT_stlport.
1283	$I.'$JAVA_HOME'.$ds."include".$ds."win32".	1323	$I.'$JAVA_HOME'.$ds."include".$ds."win32".
1284	$I.'$JAVA_HOME'.$ds."include".	1324	$I.'$JAVA_HOME'.$ds."include";
1285	$I."'".$PSDK_HOME.$INCLUDE."'";
1286	# Mingw is different	1325	# Mingw is different
1287	if ( $COM eq "MSC" )	1326	if ( $COM eq "MSC" )
		1327	{ $SOLARINC .= $I."'".$PSDK_HOME.$INCLUDE."'".
		1328	$I.'$COMPATH'.$ds."include";
		1329	}
		1330	else
1288	{ $SOLARINC .= $I.'$COMPATH'.$ds."include";	1331	{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
		1332	%lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" );
		1333	foreach $lib_include_path (%lib_include_paths)
		1334	{ chomp( $lib_include_path = qx{cygpath $lib_include_path} );
		1335	if ( $lib_include_path ne $COMPATH.$ds."include" )
		1336	{
		1337	$SOLARINC .= $I.$lib_include_path;
		1338	}
		1339	}
		1340	$SOLARINC .= $I.$GXX_INCLUDE_PATH.$I.$GXX_INCLUDE_PATH.$ds."mingw32".
		1341	$I."'".$PSDK_HOME.$INCLUDE."'";
1289	}	1342	}
1290	}	1343	}
1291	elsif ($platform eq "$Macosx")	1344	elsif ($platform eq "$Macosx")
Lines 1713-1719 Link Here
1713	ToFile( "WITH_LIBSN", "@WITH_LIBSN@", "e" );	1766	ToFile( "WITH_LIBSN", "@WITH_LIBSN@", "e" );
1714	ToFile( "LIBSN_CFLAGS", "@LIBSN_CFLAGS@", "e" );	1767	ToFile( "LIBSN_CFLAGS", "@LIBSN_CFLAGS@", "e" );
1715	ToFile( "LIBSN_LIBS", "@LIBSN_LIBS@", "e" );	1768	ToFile( "LIBSN_LIBS", "@LIBSN_LIBS@", "e" );
1716	ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" );	1769	ToFile( "GXX_INCLUDE_PATH", $GXX_INCLUDE_PATH, "e" );
1717	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );	1770	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1718	if ($platform ne "$Winnt")	1771	if ($platform ne "$Winnt")
1719	{ ToFile( "TEMP", $TEMP, "e" );	1772	{ ToFile( "TEMP", $TEMP, "e" );
Lines 2041-2049 Link Here
2041	{ # Write an environment variable to file.	2094	{ # Write an environment variable to file.
2042	if (defined $_[ 1 ])	2095	if (defined $_[ 1 ])
2043	{ printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout	2096	{ printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
2044	print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline"; # to tcsh file	2097	if ($platform eq "$Winnt" && $COM ne "MSC" )
		2098	{ $mingw_format_var = MingWCygwinFormat( $_[ 0 ] , $_[ 1 ] );
		2099	print OUT "$setenv $_[ 0 ] \"$mingw_format_var\"$newline"; # to tcsh file
		2100	}
		2101	else
		2102	{
		2103	print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline"; # to tcsh file
		2104	}
2045	if(defined($outfile_sh))	2105	if(defined($outfile_sh))
2046	{ print OUT_SH "$_[ 0 ]=\"$_[ 1 ]\"$newline"; # to sh file	2106	{
		2107	if ($platform eq "$Winnt" && $_[ 0 ] ne "PATH" && $COM ne "MSC" )
		2108	{ print OUT_SH "$_[ 0 ]=\"$mingw_format_var\"$newline"; # to sh file
		2109	}
		2110	else
		2111	{
		2112	print OUT_SH "$_[ 0 ]=\"$_[ 1 ]\"$newline"; # to sh file
		2113	}
2047	$exportvars .= " $_[ 0 ]"; # add to export list for sh file	2114	$exportvars .= " $_[ 0 ]"; # add to export list for sh file
2048	}	2115	}
2049	if(defined($outfile_bat))	2116	if(defined($outfile_bat))
Lines 2115-2120 Link Here
2115	{	2182	{
2116	if ((defined $_[ 1 ]) and ( $platform eq "$Winnt" ))	2183	if ((defined $_[ 1 ]) and ( $platform eq "$Winnt" ))
2117	{ printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout	2184	{ printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
		2185	if ($_[ 0 ] eq "ILIB" && $COM ne "MSC")
		2186	{ $mingw_format_var = MingWCygwinFormat( $_[ 0 ] , $_[ 1 ] );
		2187	print OUT "$setenv $_[ 0 ] \"$mingw_format_var\"$newline"; # to tcsh file
		2188	}
		2189	else
		2190	{
2118	$win_format_var = WinFormat( $_[ 1 ] ); #Filter for Windows	2191	$win_format_var = WinFormat( $_[ 1 ] ); #Filter for Windows
2119	$win_format_var =~ s/\\/\\\\/g;	2192	$win_format_var =~ s/\\/\\\\/g;
2120	print OUT "$setenv $_[ 0 ] \"$win_format_var\" $newline";	2193	print OUT "$setenv $_[ 0 ] \"$win_format_var\" $newline";
Lines 2124-2129 Link Here
2124	print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ] $newline";	2197	print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ] $newline";
2125	print OUT_BAT "$set $_[ 0 ]=$win_format_var $newline";	2198	print OUT_BAT "$set $_[ 0 ]=$win_format_var $newline";
2126	}	2199	}
		2200	}
2127	}	2201	}
2128	else	2202	else
2129	{	2203	{
Lines 2201-2207 Link Here
2201	foreach $d1 ( @split_var )	2275	foreach $d1 ( @split_var )
2202	{	2276	{
2203	$d1 = "-".$d1;	2277	$d1 = "-".$d1;
2204	if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[\w\.~ ]+)+)[\'\"]?/ )	2278	if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[-\+\w\.-~ ]+)+)[\'\"]?/ )
2205	# This regex: option -> $1, filename without quotes -> $2	2279	# This regex: option -> $1, filename without quotes -> $2
2206	{	2280	{
2207	$d1_prefix = $1;	2281	$d1_prefix = $1;
Lines 2230-2236 Link Here
2230	@split_var = split(/;/,$variable);	2304	@split_var = split(/;/,$variable);
2231	foreach $d1 ( @split_var )	2305	foreach $d1 ( @split_var )
2232	{	2306	{
2233	if ( $d1 =~ /(?:^\/[\w\.~ ]+)+/ )	2307	if ( $d1 =~ /(?:^\/[-\+\w\.~ ]+)+/ )
2234	{	2308	{
2235	if ( $d1 =~ / / )	2309	if ( $d1 =~ / / )
2236	{	2310	{
Lines 2253-2258 Link Here
2253	return $variable;	2327	return $variable;
2254	}	2328	}
2255	#----------------------------------------------------------	2329	#----------------------------------------------------------
		2330	# Function name: MingWCygwinFormat
		2331	# Description: Format variables to Windows Format.
		2332	# Arguments: 1. Variable (string)
		2333	# Return value: Reformatted String
		2334	#----------------------------------------------------------
		2335	sub MingWCygwinFormat
		2336	{ my ( $name, $variable, $d1, $d1_prefix, $d1_fname, @split_var );
		2337	$name = $_[ 0 ];
		2338	$variable = $_[ 1 ];
		2339	$variable =~ s/^\s+//g ; #remove leading spaces
		2340	$variable =~ s/\s+$//g ; #remove trailing spaces
		2341	if ( ( $name ne "COMPATH" ) && ( $name ne "SOLARINC" ) && ( $name ne "GXX_INCLUDE_PATH" ) &&
		2342	( $name ne "SOLARVERSION" ) && ( $name ne "ILIB" ) )
		2343	{
		2344	return $variable;
		2345	}
		2346	# Here should be NO "\"! If yes, PosixFormat() was forgotten before !
		2347	if ( $variable =~ /\\/ )
		2348	{
		2349	die("Error! Variable contains \"\\\" : $variable PosixFormat() missing?");
		2350	}
		2351	$variable =~ s/\$\{PATH\}/%PATH/g ; # explicit replace ${PATH}
		2352	$variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables
		2353	$variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables twice!
		2354	$variable =~ s/:+/:/g ; # remove multiple ;
		2355
		2356	if ( $cygwinver eq "b" )
		2357	{
		2358	$variable =~ s{//([c-z])/}{$1:\\}gi; # drives from cgywin-b20 (just in case ...)
		2359	$variable =~ s{/cygdrive/([c-z])/}{$1:/}gi; # more drives for cgywin-b20
		2360	$variable =~ s!([;]\|\A\|-[iIlL])/!$1$SYSTEMDRIVE/!g; # get back the hidden drives
		2361	}
		2362	else # New cygwin
		2363	{
		2364	# Search for posix path entry and replace with cygpath -w entry ( -d if filename contains space )
		2365	if ( $variable =~ /^\s*-\w/ )
		2366	{
		2367	# Include paths
		2368	@split_var = split(/\s+-/,$variable);
		2369	$split_var[0] =~ s/^-//; # split deletes the "-" from all but the first element
		2370	foreach $d1 ( @split_var )
		2371	{
		2372	$d1 = "-".$d1;
		2373	if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[-\+\w\.~ ]+)+)[\'\"]?/ )
		2374	# This regex: option -> $1, filename without quotes -> $2
		2375	{
		2376	$d1_prefix = $1;
		2377	$d1_fname = $2;
		2378	if ( $d1_fname =~ / / )
		2379	{
		2380	chomp( $d1_fname = qx{cygpath -m -s "$d1_fname"} ); # Use DOS 8.3 style to avoid quoting
		2381	} # ! This fails when $d1 doesn't exist!
		2382	else
		2383	{
		2384	chomp( $d1_fname = qx{cygpath -m "$d1_fname"} ); # Use "normal" filenames
		2385	}
		2386	$d1 = $d1_prefix.$d1_fname;
		2387	}
		2388	else
		2389	{ # relative paths here
		2390	# Do nothing.
		2391	}
		2392	}
		2393	$variable = join(' ',@split_var);
2394	}
2395	elsif ( $variable eq ";" ) {}
2396	else
2397	{
2398	# Normal paths
2399	@split_var = split(/:/,$variable);
2400	foreach $d1 ( @split_var )
2401	{
2402	if ( $d1 =~ /(?:^\/[-\+\w\.~ ]+)+/ )
2403	{
2404	if ( $d1 =~ / / )
2405	{
2406	chomp( $d1 = qx{cygpath -m -s "$d1"} ); # Use DOS 8.3 style to avoid quoting
2407	} # ! This fails when $d1 doesn't exist!
2408	else
2409	{
2410	chomp( $d1 = qx{cygpath -m "$d1"} ); # Use "normal" filenames
2411	}
2412	}
2413	else
2414	{ # relative paths here
2415	# Do nothing.
2416	}
2417	}
2418	$variable = join(';',@split_var);
2419	}
2420	}
2421	if ( $name eq "PATH" )
2422	{
2423	$variable = PosixFormat($variable);
2424	return $variable;
2425	}
2426	return $variable;
2427	}
2428	#----------------------------------------------------------
2256	# Function name: CheckBuildEnv	2429	# Function name: CheckBuildEnv
2257	# Description: Checks whether the build environment	2430	# Description: Checks whether the build environment
2258	# exists on the system.	2431	# exists on the system.




PACKAGE_STRING=
PACKAGE_BUGREPORT=

ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_DEBUG ENABLE_SYMBOLS USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH USE_GCC3 GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH WDEVENV_PATH CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 SOLAR_JAVA JAVAC JAVA JAVA_HOME JDK XMKMF PERL TCSH PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB PSDK_HOME BISON FLEX PATCH GNUPATCH GNUCP CYGWIN ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN ANT ANT_HOME UPD LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN OSVERSION LIBOBJS LTLIBOBJS LIB_INCLUDE_PATH'
ac_subst_files=''

# Initialize some variables set by options.

                          Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>

  --with-mspdb-path       For Microsoft C/C++ compiler users, please supply the path
                          pointing to the mspdb60.dll (MSVC 6) or mspdb7x.dll (.NET).

                          Usage: --with-mspdb-path=<absolute path to mspdb60.dll/mspdb7x.dll>

  --with-midl-path       For Microsoft C/C++ .NET compiler users, please supply the path
                          pointing to the midl.exe.

	if test "$WITH_MINGWIN" != "yes"; then
		echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5
echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6
										# Extract the first word of "mspdb71.dll", so it can be a program name with args.
set dummy mspdb71.dll; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  case $MSPDB_PATH in
  [\\/]* | ?:[\\/]*)
  ac_cv_path_MSPDB_PATH="$MSPDB_PATH" # Let the user override the test with a path.
  ;;
  *)
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
  for ac_exec_ext in '' $ac_executable_extensions; do
  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    break 2
  fi
done
done

  ;;
esac
fi
MSPDB_PATH=$ac_cv_path_MSPDB_PATH

if test -n "$MSPDB_PATH"; then
  echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
echo "${ECHO_T}$MSPDB_PATH" >&6
else
  echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi

		if test -n "$MSPDB_PATH";then
			MSPDB_PATH=`dirname $MSPDB_PATH`
		fi
   		if test -e "$with_mspdb_path/mspdb71.dll"; then
			MSPDB_PATH="$with_mspdb_path"
		fi
		if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb71.dll"; then
			MSPDB_PATH="$with_cl_home/../Common7/IDE"
		fi
		if test -z "$MSPDB_PATH"; then
										# Extract the first word of "mspdb70.dll", so it can be a program name with args.
set dummy mspdb70.dll; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5

echo "$as_me: error: You need a mspdb?0.dll, make sure it's in the path or use --with-mspdb-path" >&2;}
   { (exit 1); exit 1; }; }
		fi
		fi
		MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
		MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
		PATH="$MSPDB_PATH:$PATH"

							}"`
			echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5
echo "${ECHO_T}found Compiler version $CCNUMVER." >&6
			if test $CCNUMVER -ge "001300100000"; then
				COMEX=10
			else
				if test $CCNUMVER -ge "001300000000"; then
					COMEX=8
				else
					if test $CCNUMVER -ge "001200000000"; then
						if test "$with_old_psdk" != "yes"; then
							COMEX=9
						else
							COMEX=7
						fi
					else
						{ { echo "$as_me:$LINENO: error: Compiler too old." >&5
	echo "$as_me: error: Compiler too old." >&2;}
	   { (exit 1); exit 1; }; }
					fi
				else
					{ { echo "$as_me:$LINENO: error: Compiler too old." >&5
echo "$as_me: error: Compiler too old." >&2;}
   { (exit 1); exit 1; }; }
				fi
			fi
		else

	else
		echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5
echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6
		if test `$CC -dumpmachine | $AWK -F- '{ print $1 }'` = "mingw32"; then
			echo "$as_me:$LINENO: result: found." >&5
echo "${ECHO_T}found." >&6
		else




if test "$COMEX" = "8" -o "$COMEX" = "10" ; then
		# Extract the first word of "midl.exe", so it can be a program name with args.
set dummy midl.exe; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5

	if test -n "$MIDL_PATH";then
		MIDL_PATH=`dirname $MIDL_PATH`
	fi
	if test -e "$with_midl_path/midl.exe"; then
		MIDL_PATH="$with_midl_path"
	fi
	if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
		MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
	fi
	if test ! -e "$MIDL_PATH/midl.exe"; then
		{ { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5
echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;}
   { (exit 1); exit 1; }; }

fi
GXX_INCLUDE_PATH="$_gxx_include_path"

if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
   _lib_include_path=`echo "#include <stddef.h>" | $CC -E - | $SED -n '/.*1*"\(.*\)\/stddef.h".*/s//\1/p' | sort -u | xargs echo`
else
   _lib_include_path="NO_LIB_INCLUDE"
fi
LIB_INCLUDE_PATH="$_lib_include_path"

if test "$_os" = "SunOS"; then
      if test "$CC" = "cc"; then

fi


if test "$_os" = "WINNT" -a "$COMEX" = "10"; then
   echo "$as_me:$LINENO: checking msvcp71.dll" >&5
echo $ECHO_N "checking msvcp71.dll... $ECHO_C" >&6
   if test -f ../external/msvcp71/msvcp71.dll; then
      echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
   else
      { { echo "$as_me:$LINENO: error: The msvcp71.dll is missing in external/msvcp71/.
The dll is part of the .NET installation and can be found in a directory
similar to:
\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\"
Please copy the file to external/msvcp71." >&5
echo "$as_me: error: The msvcp71.dll is missing in external/msvcp71/.
The dll is part of the .NET installation and can be found in a directory
similar to:
\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\"
Please copy the file to external/msvcp71." >&2;}
   { (exit 1); exit 1; }; }
   fi
fi


WITH_GPC=NO
WITH_LIBART=NO


s,@OSVERSION@,$OSVERSION,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
s,@LIB_INCLUDE_PATH@,$LIB_INCLUDE_PATH,;t t
CEOF

_ACEOF





		Get_Attribute(sAttrValue, sAttrName);

		unsigned i = 0;
		for ( ; i < nSize; ++i )
		{
			if ( i_rAttrNames[i] == sAttrName )
            {

{
	char * pResult = &sWord[0];

	char * pSet = pResult;
	for ( ;
		  *text != i_cEnd;
		  ++text )
	{


	if (i_bReverseName)
	{
        const int nMaxLen = 1000;
        if (strlen(pResult) < nMaxLen)
        {
    		char * sBreak = strrchr(pResult,'.');

Lines 65-71 Link Here

(-)./xml2cmp/source/support/badcast.cxx.orig (-1 / +1 lines)
65	due to problems with WNT-STL-headers.	65	due to problems with WNT-STL-headers.
66	*/	66	*/
67		67
68	#ifdef WNT	68	#if defined(WNT) && !defined(__MINGW32__)
69		69
70	#define _NTSDK	70	#define _NTSDK
71	#include<typeinfo>	71	#include<typeinfo>

Lines 118-124 Link Here

(-)./dmake/win95/microsft/Makefile.in.orig (-1 / +1 lines)
118		118
119	libmsft_a_SOURCES = ruletab.c	119	libmsft_a_SOURCES = ruletab.c
120		120
121	INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I..	121	INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I..
122	subdir = win95/microsft	122	subdir = win95/microsft
123	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	123	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
124	CONFIG_HEADER = $(top_builddir)/config.h	124	CONFIG_HEADER = $(top_builddir)/config.h

Lines 5666-5672 Link Here

(-)./dmake/configure.orig (-1 / +1 lines)
5666		5666
5667	if test `echo $_os \| $AWK -F_ '{ print $1 }'` = "CYGWIN"; then	5667	if test `echo $_os \| $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
5668	if test "$GCC" = "yes"; then	5668	if test "$GCC" = "yes"; then
5669	if test `$CC -dumpmachine \| $AWK -F- '{ print $3 }'` = "mingw32"; then	5669	if test `$CC -dumpmachine \| $AWK -F- '{ print $1 }'` = "mingw32"; then
5670	_os="MINGW"	5670	_os="MINGW"
5671	else	5671	else
5672	_os="CYGWIN"	5672	_os="CYGWIN"

Lines 1-6 Link Here

(-)./scaddins/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.jar	2	..\%__SRC%\class\.jar %_DEST%\bin%_EXT%\.jar
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	6	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	7	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 61-64 Link Here

(-)./sal/systools/win32/uwinapi/FindFirstVolumeA.cpp.orig (-1 / +5 lines)
61		61
62	#include "macros.h"	62	#include "macros.h"
63		63
64	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) )	64	#ifdef __MINGW32__
		65	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPCSTR lpszVolumeName, DWORD cchBufferLength) )
		66	#else
		67	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) )
		68	#endif

Lines 61-64 Link Here

(-)./sal/systools/win32/uwinapi/FindFirstVolumeW.cpp.orig (-1 / +5 lines)
61		61
62	#include "macros.h"	62	#include "macros.h"
63		63
64	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) )	64	#ifdef __MINGW32__
		65	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPCWSTR lpszVolumeName, DWORD cchBufferLength) )
		66	#else
		67	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) )
		68	#endif

Lines 61-64 Link Here

(-)./sal/systools/win32/uwinapi/FindNextVolumeA.cpp.orig (-1 / +5 lines)
61		61
62	#include "macros.h"	62	#include "macros.h"
63		63
64	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) )	64	#ifdef __MINGW32__
		65	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPCSTR lpszVolumeName, DWORD cchBufferLength) )
		66	#else
		67	DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) )
		68	#endif

Lines 105-111 Link Here

(-)./sal/systools/win32/uwinapi/GetProcessId.cpp.orig (+4 lines)
105		105
106	typedef DWORD (WINAPI OBFUSCATE)( DWORD dwPTID );	106	typedef DWORD (WINAPI OBFUSCATE)( DWORD dwPTID );
107	typedef OBFUSCATE *LPOBFUSCATE;	107	typedef OBFUSCATE *LPOBFUSCATE;
		108	#ifdef __MINGW32__
		109	static OBFUSCATE Obfuscate;
		110	#else
108	OBFUSCATE Obfuscate;	111	OBFUSCATE Obfuscate;
		112	#endif
109		113
110	static DWORD WINAPI Obfuscate( DWORD dwPTID )	114	static DWORD WINAPI Obfuscate( DWORD dwPTID )
111	{	115	{







#ifdef __MINGW32__
#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
static void func##_Thunk(); \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
EXTERN_C rettype calltype func params \
{ \
	asm("	popl	%ebp"); \
	asm("	jmp	(%0)"::"m"(module##_##func##_Ptr)); \
} \
EXTERN_C rettype calltype func##_##resolve params; \
static rettype calltype func##_##Failure params; \
static void func##_Thunk() \
{ \
	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
	asm("	movl	%ebp, %esp"); \
	asm("	popl	%ebp"); \
	asm("	jmp	(%0)"::"m"(module##_##func##_Ptr)); \
} \
static rettype calltype func##_##Failure params \
{ \
	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
	return (rettype)0; \
} \
EXTERN_C rettype calltype func##_##resolve params
#else
#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
EXTERN_C rettype calltype func##_##resolve params; \

	return (rettype)0; \
} \
EXTERN_C rettype calltype func##_##resolve params
#endif



#ifdef __MINGW32__
#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
static void func##_Thunk(); \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
static void func##_Thunk() \
{ \
	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
	asm("	movl	%ebp, %esp"); \
	asm("	popl	%ebp"); \
	asm("	jmp	(%0)"::"m"(module##_##func##_Ptr)); \
} \
EXTERN_C rettype calltype func params \
{ \
	asm("	popl	%ebp"); \
	asm("	jmp	(%0)"::"m"(module##_##func##_Ptr)); \
}
#else
#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
static _declspec ( naked ) void func##_Thunk() \

	_asm	jmp	[module##_##func##_Ptr] \
} \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
#endif


#ifdef __MINGW32__
#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
static void func##_Thunk(); \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
static rettype calltype func##_##Failure params; \
static _declspec ( naked ) void func##_Thunk() \
{ \
	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \
	asm("	movl	%ebp, %esp"); \
	asm("	popl	%ebp"); \
	asm("	jmp	(%0)"::"m"(module##_##func##_Ptr)); \
} \
EXTERN_C _declspec( naked ) rettype calltype func params \
{ \
	asm("	popl	%ebp"); \
	asm("	jmp	(%0)"::"m"(module##_##func##_Ptr)); \
} \
static rettype calltype func##_##Failure params \
{ \
	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
	return (rettype)0; \
}
#else
#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
static rettype calltype func##_##Failure params; \

	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
	return (rettype)0; \
}
#endif


Lines 105-107 Link Here

(-)./sal/systools/win32/uwinapi/uwinapi.dxp.orig (+4 lines)
105	GetVolumePathNameW	105	GetVolumePathNameW
106	SetVolumeMountPointA	106	SetVolumeMountPointA
107	SetVolumeMountPointW	107	SetVolumeMountPointW
		108	snprintf
		109	snwprintf
		110	vsnprintf
		111	vsnwprintf

Lines 11-18 Link Here

(-)./sal/systools/win32/uwinapi/sntprintf.c.orig (-1 / +4 lines)
11	/* The non-debug versions of _vscprintf/_scprintf are just calls	11	/* The non-debug versions of _vscprintf/_scprintf are just calls
12	to _vsprintf/_sprintf with string buffer pointer set to NULL,	12	to _vsprintf/_sprintf with string buffer pointer set to NULL,
13	requires MSVCRT version 7.0 */	13	requires MSVCRT version 7.0 */
14		14	#ifdef __MINGW32__
		15	static int __cdecl _vsctprintf( const TCHAR *format, va_list ap )
		16	#else
15	static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap )	17	static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap )
		18	#endif
16	{	19	{
17	FILE *fp = _tfopen( _T("NUL"), _T("wb") );	20	FILE *fp = _tfopen( _T("NUL"), _T("wb") );
18		21

Lines 169-175 Link Here

(-)./sal/systools/win32/guistdio/guistdio.cxx.orig (+4 lines)
169		169
170	//---------------------------------------------------------------------------	170	//---------------------------------------------------------------------------
171		171
		172	#ifdef __MINGW32__
		173	int main( int argc, char **argv )
		174	#else
172	int _tmain( int argc, _TCHAR **argv )	175	int _tmain( int argc, _TCHAR **argv )
		176	#endif
173	{	177	{
174	TCHAR szTargetFileName[MAX_PATH] = TEXT("");	178	TCHAR szTargetFileName[MAX_PATH] = TEXT("");
175	STARTUPINFO aStartupInfo;	179	STARTUPINFO aStartupInfo;

Lines 130-136 Link Here

(-)./sal/rtl/source/uuid.cxx.orig (+12 lines)
130		130
131	nTime = ((sal_uInt64) val.Seconds) *((sal_uInt64)10000000) +	131	nTime = ((sal_uInt64) val.Seconds) *((sal_uInt64)10000000) +
132	((sal_uInt64) val.Nanosec) /100 +	132	((sal_uInt64) val.Nanosec) /100 +
		133	#ifdef __MINGW32__
		134	(sal_uInt64)(0x01B21DD213814000ULL);
		135	#else
133	(sal_uInt64)(0x01B21DD213814000);	136	(sal_uInt64)(0x01B21DD213814000);
		137	#endif
134		138
135	return nTime;	139	return nTime;
136	}	140	}
Lines 253-259 Link Here
253	((sal_uInt16) uuid.clock_seq_low );	257	((sal_uInt16) uuid.clock_seq_low );
254		258
255	memcpy( pNode, &( uuid.node ) , 6 );	259	memcpy( pNode, &( uuid.node ) , 6 );
		260	#ifdef __MINGW32__
		261	pTime = pTime & 0x0fffffffffffffffULL;
		262	#else
256	pTime = pTime & 0x0fffffffffffffff;	263	pTime = pTime & 0x0fffffffffffffff;
		264	#endif
257	pClockSeq = pClockSeq & 0x3fff;	265	pClockSeq = pClockSeq & 0x3fff;
258		266
259	}	267	}
Lines 266-272 Link Here
266	UUID uuid;	274	UUID uuid;
267	/* 1	275	/* 1
268	0123456789012345 */	276	0123456789012345 */
		277	#ifdef __MINGW32__
		278	nTime = ( nTime & 0x0fffffffffffffffULL ) \| 0x1000000000000000ULL;
		279	#else
269	nTime = ( nTime & 0x0fffffffffffffff ) \| 0x1000000000000000;	280	nTime = ( nTime & 0x0fffffffffffffff ) \| 0x1000000000000000;
		281	#endif
270	nClockSeq = ( nClockSeq & 0x3fff ) \| 0x8000;	282	nClockSeq = ( nClockSeq & 0x3fff ) \| 0x8000;
271		283
272	uuid.time_low = (sal_uInt32) ( nTime & 0xffffffff );	284	uuid.time_low = (sal_uInt32) ( nTime & 0xffffffff );

Lines 132-149 Link Here

(-)./sal/osl/w32/path_helper.cxx.orig (+14 lines)
132	******************************************************************/	132	******************************************************************/
133		133
134	// is [A-Za-z]:[/\|\]\0	134	// is [A-Za-z]:[/\|\]\0
		135	#ifdef __MINGW32__
		136	const wchar_t* LDP = L":";
		137	const wchar_t* LDP_WITH_BACKSLASH = L":\\";
		138	const wchar_t* LDP_WITH_SLASH = L":/";
		139	#else
135	const sal_Unicode* LDP = L":";	140	const sal_Unicode* LDP = L":";
136	const sal_Unicode* LDP_WITH_BACKSLASH = L":\\";	141	const sal_Unicode* LDP_WITH_BACKSLASH = L":\\";
137	const sal_Unicode* LDP_WITH_SLASH = L":/";	142	const sal_Unicode* LDP_WITH_SLASH = L":/";
		143	#endif
138		144
139	// degenerated case returned by the Windows FileOpen dialog	145	// degenerated case returned by the Windows FileOpen dialog
140	// when someone enters for instance "x:filename", the Win32	146	// when someone enters for instance "x:filename", the Win32
141	// API accepts this case	147	// API accepts this case
		148	#ifdef __MINGW32__
		149	const wchar_t* LDP_WITH_DOT_BACKSLASH = L":.\\";
		150	#else
142	const sal_Unicode* LDP_WITH_DOT_BACKSLASH = L":.\\";	151	const sal_Unicode* LDP_WITH_DOT_BACKSLASH = L":.\\";
		152	#endif
143		153
144	sal_Int32 osl_systemPathIsLogicalDrivePattern(/in/ const rtl_uString* pustrPath)	154	sal_Int32 osl_systemPathIsLogicalDrivePattern(/in/ const rtl_uString* pustrPath)
145	{	155	{
		156	#ifdef __MINGW32__
		157	const wchar_t* p = reinterpret_cast< const wchar_t * >(rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath)));
		158	#else
146	const sal_Unicode* p = rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath));	159	const sal_Unicode* p = rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath));
		160	#endif
147	if (iswalpha(*p++))	161	if (iswalpha(*p++))
148	{	162	{
149	return ((0 == wcscmp(p, LDP)) \|\|	163	return ((0 == wcscmp(p, LDP)) \|\|

Lines 97-102 Link Here

(-)./sal/osl/w32/system.h.orig (+4 lines)
97	// at the same time without patching	97	// at the same time without patching
98	// windows.h	98	// windows.h
99	#include <windows.h>	99	#include <windows.h>
		100	#ifdef __MINGW32__
		101	#include <winsock2.h>
		102	#include <ws2tcpip.h>
		103	#endif
100	#else	104	#else
101	// winsock2.h includes windows.h	105	// winsock2.h includes windows.h
102	#include <winsock2.h>	106	#include <winsock2.h>





oslFileError MapWindowsErrorToOSLError( DWORD dwError );

#ifndef __MINGW32__
/* Allocate n number of t's on the stack 
   return a pointer to it in p */
   
#define STACK_ALLOC(p, t, n) __try {(p) = _alloca((n)*sizeof(t));} \
                             __except(EXCEPTION_EXECUTE_HANDLER) {(p) = NULL;}
#endif
                             
/* =============================== */
/* osl_gettempDirURL               */

    if (osl_File_E_None != osl_error)
        return osl_error;
   
#ifdef __MINGW32__
    tmp_name = malloc((rtl_uString_getLength(base_directory) + MAX_PATH)*sizeof(WCHAR));
#else
    /* allocate enough space on the stack */
    STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH));
#endif
    
    if (tmp_name)
    {

            b_delete_on_close,
            pHandle,
            ppustrTempFileURL);
#ifdef __MINGW32__
        free(tmp_name);
#endif
    }
    else // stack alloc failed
    {

Lines 80-85 Link Here

(-)./sal/osl/w32/interlck.c.orig (+22 lines)
80	#ifdef _M_IX86	80	#ifdef _M_IX86
81	#pragma warning(disable: 4035)	81	#pragma warning(disable: 4035)
82	{	82	{
		83	#ifdef __MINGW32__
		84	asm
		85	(
		86	" movl %0, %%ecx\n"
		87	" movl $1, %%eax\n"
		88	" lock xadd %%eax, (%%ecx)\n"
		89	" incl %%eax\n"
		90	::"m"(pCount)
		91	);
		92	#else
83	__asm	93	__asm
84	{	94	{
85	mov ecx, pCount	95	mov ecx, pCount
Lines 87-92 Link Here
87	lock xadd dword ptr [ecx],eax	97	lock xadd dword ptr [ecx],eax
88	inc eax	98	inc eax
89	}	99	}
		100	#endif
90	}	101	}
91	#pragma warning(default: 4035)	102	#pragma warning(default: 4035)
92	#else	103	#else
Lines 103-108 Link Here
103	#ifdef _M_IX86	114	#ifdef _M_IX86
104	#pragma warning(disable: 4035)	115	#pragma warning(disable: 4035)
105	{	116	{
		117	#ifdef __MINGW32__
		118	asm
		119	(
		120	" movl %0, %%ecx\n"
		121	" movl $-1, %%eax\n"
		122	" lock xadd %%eax, (%%ecx)\n"
		123	" decl %%eax\n"
		124	::"m"(pCount)
		125	);
		126	#else
106	__asm	127	__asm
107	{	128	{
108	mov ecx, pCount	129	mov ecx, pCount
Lines 110-115 Link Here
110	lock xadd dword ptr [ecx],eax	131	lock xadd dword ptr [ecx],eax
111	dec eax	132	dec eax
112	}	133	}
		134	#endif
113	}	135	}
114	#pragma warning(default: 4035)	136	#pragma warning(default: 4035)
115	#else	137	#else

Lines 66-72 Link Here

(-)./sal/osl/w32/signal.c.orig (+2 lines)
66	#include <osl/diagnose.h>	66	#include <osl/diagnose.h>
67	#include <osl/mutex.h>	67	#include <osl/mutex.h>
68	#include <osl/signal.h>	68	#include <osl/signal.h>
		69	#ifndef __MINGW32__
69	#include <DbgHelp.h>	70	#include <DbgHelp.h>
		71	#endif
70	#include <ErrorRep.h>	72	#include <ErrorRep.h>
71	#include <systools/win32/uwinapi.h>	73	#include <systools/win32/uwinapi.h>
72		74

Lines 137-147 Link Here

(-)./sal/osl/w32/fileimpl.cxx.orig (-2 / +50 lines)
137	//##################################################################	137	//##################################################################
138	// simply checking if this path starts with '\\'	138	// simply checking if this path starts with '\\'
139		139
		140	#ifdef __MINGW32__
		141	const wchar_t* UNC_PREFIX = L"\\\\";
		142
		143	bool is_UNC_path(const rtl::OUString& path)
		144	{
		145	return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast< const wchar_t * >(path.getStr()), wcslen(UNC_PREFIX)));
		146	#else
140	const sal_Unicode* UNC_PREFIX = L"\\\\";	147	const sal_Unicode* UNC_PREFIX = L"\\\\";
141		148
142	bool is_UNC_path(const rtl::OUString& path)	149	bool is_UNC_path(const rtl::OUString& path)
143	{	150	{
144	return (0 == wcsncmp(UNC_PREFIX, path.getStr(), wcslen(UNC_PREFIX)));	151	return (0 == wcsncmp(UNC_PREFIX, path.getStr(), wcslen(UNC_PREFIX)));
		152	#endif
145	}	153	}
146		154
147	//##################################################################	155	//##################################################################
Lines 189-201 Link Here
189		197
190	if (!is_floppy_drive(p))	198	if (!is_floppy_drive(p))
191	{	199	{
		200	#ifdef __MINGW32__
		201	DWORD fattr = GetFileAttributes(reinterpret_cast< const wchar_t * >(p.getStr()));
		202	#else
192	DWORD fattr = GetFileAttributes(p.getStr());	203	DWORD fattr = GetFileAttributes(p.getStr());
193		204	#endif
194	if ((INVALID_FILE_ATTRIBUTES != fattr) &&	205	if ((INVALID_FILE_ATTRIBUTES != fattr) &&
195	(FILE_ATTRIBUTE_REPARSE_POINT & fattr))	206	(FILE_ATTRIBUTE_REPARSE_POINT & fattr))
196	{	207	{
197	WIN32_FIND_DATA find_data;	208	WIN32_FIND_DATA find_data;
		209	#ifdef __MINGW32__
		210	HANDLE h_find = FindFirstFile(reinterpret_cast< const wchar_t * >(p.getStr()), &find_data);
		211	#else
198	HANDLE h_find = FindFirstFile(p.getStr(), &find_data);	212	HANDLE h_find = FindFirstFile(p.getStr(), &find_data);
		213	#endif
199		214
200	if (IsValidHandle(h_find) &&	215	if (IsValidHandle(h_find) &&
201	(FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) &&	216	(FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) &&
Lines 285-291 Link Here
285	osl_systemPathEnsureSeparator(&p.pData);	300	osl_systemPathEnsureSeparator(&p.pData);
286		301
287	TCHAR vn[51];	302	TCHAR vn[51];
		303	#ifdef __MINGW32__
		304	if (GetVolumeNameForVolumeMountPoint(reinterpret_cast< const wchar_t * >(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
		305	#else
288	if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn)))	306	if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn)))
		307	#endif
289	{	308	{
290	TCHAR vnfloppy[51];	309	TCHAR vnfloppy[51];
291	if (is_floppy_A_present() &&	310	if (is_floppy_A_present() &&
Lines 307-318 Link Here
307	// for the drive letter alone is not sufficient	326	// for the drive letter alone is not sufficient
308	// we must compare the unique volume name with	327	// we must compare the unique volume name with
309	// that of the available floppy disks	328	// that of the available floppy disks
		329	#ifdef __MINGW32__
		330	const wchar_t* FLOPPY_DRV_LETTERS = TEXT("AaBb");
		331
		332	bool is_floppy_drive(const rtl::OUString& path)
		333	{
		334	const wchar_t* pf = reinterpret_cast< const wchar_t * >(path.getStr());
		335	const wchar_t* ps = pf + 1;
		336	#else
310	const sal_Unicode* FLOPPY_DRV_LETTERS = TEXT("AaBb");	337	const sal_Unicode* FLOPPY_DRV_LETTERS = TEXT("AaBb");
311		338
312	bool is_floppy_drive(const rtl::OUString& path)	339	bool is_floppy_drive(const rtl::OUString& path)
313	{	340	{
314	const sal_Unicode* pf = path.getStr();	341	const sal_Unicode* pf = path.getStr();
315	const sal_Unicode* ps = path.getStr() + 1;	342	const sal_Unicode* ps = path.getStr() + 1;
		343	#endif
316	return ((wcschr(FLOPPY_DRV_LETTERS, pf) && (L':' == ps)) \|\|	344	return ((wcschr(FLOPPY_DRV_LETTERS, pf) && (L':' == ps)) \|\|
317	is_floppy_volume_mount_point(path));	345	is_floppy_volume_mount_point(path));
318	}	346	}
Lines 327-333 Link Here
327	osl_systemPathEnsureSeparator(&p.pData);	355	osl_systemPathEnsureSeparator(&p.pData);
328		356
329	TCHAR vn[51];	357	TCHAR vn[51];
		358	#ifdef __MINGW32__
		359	if (GetVolumeNameForVolumeMountPoint(reinterpret_cast< const wchar_t * >(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
		360	#else
330	if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn)))	361	if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn)))
		362	#endif
331	return GetDriveType(vn);	363	return GetDriveType(vn);
332		364
333	return DRIVE_NO_ROOT_DIR;	365	return DRIVE_NO_ROOT_DIR;
Lines 342-348 Link Here
342	if (is_volume_mount_point(path))	374	if (is_volume_mount_point(path))
343	drive_type = get_volume_mount_point_drive_type(path);	375	drive_type = get_volume_mount_point_drive_type(path);
344	else	376	else
		377	#ifdef __MINGW32__
		378	drive_type = GetDriveType(reinterpret_cast< const wchar_t * >(path.getStr()));
		379	#else
345	drive_type = GetDriveType(path.getStr());	380	drive_type = GetDriveType(path.getStr());
		381	#endif
346		382
347	if (DRIVE_NO_ROOT_DIR == drive_type)	383	if (DRIVE_NO_ROOT_DIR == drive_type)
348	return MapError(ERROR_INVALID_DRIVE);	384	return MapError(ERROR_INVALID_DRIVE);
Lines 392-398 Link Here
392	void get_volume_space_information(const rtl::OUString& path, oslVolumeInfo *pInfo)	428	void get_volume_space_information(const rtl::OUString& path, oslVolumeInfo *pInfo)
393	{	429	{
394	BOOL ret = GetDiskFreeSpaceEx(	430	BOOL ret = GetDiskFreeSpaceEx(
		431	#ifdef __MINGW32__
		432	reinterpret_cast< const wchar_t * >(path.getStr()),
		433	#else
395	path.getStr(),	434	path.getStr(),
		435	#endif
396	(PULARGE_INTEGER)&pInfo->uFreeSpace,	436	(PULARGE_INTEGER)&pInfo->uFreeSpace,
397	(PULARGE_INTEGER)&pInfo->uTotalSpace,	437	(PULARGE_INTEGER)&pInfo->uTotalSpace,
398	NULL);	438	NULL);
Lines 443-449 Link Here
443	DWORD mcl;	483	DWORD mcl;
444	DWORD flags;	484	DWORD flags;
445		485
		486	#ifdef __MINGW32__
		487	if (GetVolumeInformation(reinterpret_cast<const wchar_t * >(path.getStr()), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH))
		488	#else
446	if (GetVolumeInformation(path.getStr(), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH))	489	if (GetVolumeInformation(path.getStr(), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH))
		490	#endif
447	{	491	{
448	pInfo->uValidFields \|= osl_VolumeInfo_Mask_MaxNameLength;	492	pInfo->uValidFields \|= osl_VolumeInfo_Mask_MaxNameLength;
449	pInfo->uMaxNameLength = mcl;	493	pInfo->uMaxNameLength = mcl;
Lines 452-458 Link Here
452	pInfo->uMaxPathLength = MAX_PATH;	496	pInfo->uMaxPathLength = MAX_PATH;
453		497
454	pInfo->uValidFields \|= osl_VolumeInfo_Mask_FileSystemName;	498	pInfo->uValidFields \|= osl_VolumeInfo_Mask_FileSystemName;
		499	#ifdef __MINGW32__
		500	rtl_uString_newFromStr(&pInfo->ustrFileSystemName, reinterpret_cast<const sal_Unicode * >(fsn));
		501	#else
455	rtl_uString_newFromStr(&pInfo->ustrFileSystemName, fsn);	502	rtl_uString_newFromStr(&pInfo->ustrFileSystemName, fsn);
		503	#endif
456		504
457	// volumes (even NTFS) will always be considered case	505	// volumes (even NTFS) will always be considered case
458	// insensitive because the Win32 API is not able to	506	// insensitive because the Win32 API is not able to

Lines 1037-1043 Link Here

(-)./sal/osl/w32/socket.cxx.orig (+217 lines)
1037	/*****************************************************************************/	1037	/*****************************************************************************/
1038	oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname)	1038	oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname)
1039	{	1039	{
		1040	#ifdef __MINGW32__
		1041	static wchar_t LocalHostname[256] = L"";
		1042	#else
1040	static sal_Unicode LocalHostname[256] = L"";	1043	static sal_Unicode LocalHostname[256] = L"";
		1044	#endif
1041		1045
1042	if (wcslen(LocalHostname) == 0)	1046	if (wcslen(LocalHostname) == 0)
1043	{	1047	{
Lines 1059-1065 Link Here
1059	rtl_uString_release (hostName);	1063	rtl_uString_release (hostName);
1060		1064
1061	if (pAddr && pAddr->pHostName)	1065	if (pAddr && pAddr->pHostName)
		1066	#ifdef __MINGW32__
		1067	wcscpy(LocalHostname, reinterpret_cast< wchar_t * >(pAddr->pHostName->buffer));
		1068	#else
1062	wcscpy(LocalHostname, pAddr->pHostName->buffer);	1069	wcscpy(LocalHostname, pAddr->pHostName->buffer);
		1070	#endif
1063	else	1071	else
1064	memset(LocalHostname, 0, sizeof(LocalHostname));	1072	memset(LocalHostname, 0, sizeof(LocalHostname));
1065		1073
Lines 1070-1076 Link Here
1070		1078
1071	if (wcslen(LocalHostname) > 0)	1079	if (wcslen(LocalHostname) > 0)
1072	{	1080	{
		1081	#ifdef __MINGW32__
		1082	rtl_uString_newFromStr (strLocalHostname, reinterpret_cast< sal_Unicode * >(LocalHostname));
		1083	#else
1073	rtl_uString_newFromStr (strLocalHostname, LocalHostname);	1084	rtl_uString_newFromStr (strLocalHostname, LocalHostname);
		1085	#endif
1074	return osl_Socket_Ok;	1086	return osl_Socket_Ok;
1075	}	1087	}
1076		1088
Lines 1927-2137 Link Here
1927	switch(error = WSAGetLastError())	1939	switch(error = WSAGetLastError())
1928	{	1940	{
1929	case WSAENOTSOCK:	1941	case WSAENOTSOCK:
		1942	#ifdef __MINGW32__
		1943	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTSOCK, Socket operation on non-socket. A socket created in one process is used by another process."));
		1944	#else
1930	rtl_uString_newFromStr (strError, L"WSAENOTSOCK, Socket operation on non-socket. A socket created in one process is used by another process.");	1945	rtl_uString_newFromStr (strError, L"WSAENOTSOCK, Socket operation on non-socket. A socket created in one process is used by another process.");
		1946	#endif
1931	break;	1947	break;
1932		1948
1933	case WSAEDESTADDRREQ:	1949	case WSAEDESTADDRREQ:
		1950	#ifdef __MINGW32__
		1951	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDESTADDRREQ, Destination Addr required"));
		1952	#else
1934	rtl_uString_newFromStr (strError, L"WSAEDESTADDRREQ, Destination Addr required");	1953	rtl_uString_newFromStr (strError, L"WSAEDESTADDRREQ, Destination Addr required");
		1954	#endif
1935	break;	1955	break;
1936		1956
1937	case WSAEMSGSIZE:	1957	case WSAEMSGSIZE:
		1958	#ifdef __MINGW32__
		1959	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEMSGSIZE, Message too long"));
		1960	#else
1938	rtl_uString_newFromStr (strError, L"WSAEMSGSIZE, Message too long");	1961	rtl_uString_newFromStr (strError, L"WSAEMSGSIZE, Message too long");
		1962	#endif
1939	break;	1963	break;
1940		1964
1941	case WSAEPROTOTYPE:	1965	case WSAEPROTOTYPE:
		1966	#ifdef __MINGW32__
		1967	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROTOTYPE, Protocol wrong type for socket"));
		1968	#else
1942	rtl_uString_newFromStr (strError, L"WSAEPROTOTYPE, Protocol wrong type for socket");	1969	rtl_uString_newFromStr (strError, L"WSAEPROTOTYPE, Protocol wrong type for socket");
		1970	#endif
1943	break;	1971	break;
1944		1972
1945	case WSAENOPROTOOPT:	1973	case WSAENOPROTOOPT:
		1974	#ifdef __MINGW32__
		1975	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOPROTOOPT, Protocol not available"));
		1976	#else
1946	rtl_uString_newFromStr (strError, L"WSAENOPROTOOPT, Protocol not available");	1977	rtl_uString_newFromStr (strError, L"WSAENOPROTOOPT, Protocol not available");
		1978	#endif
1947	break;	1979	break;
1948		1980
1949	case WSAEPROTONOSUPPORT:	1981	case WSAEPROTONOSUPPORT:
		1982	#ifdef __MINGW32__
		1983	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROTONOSUPPORT, Protocol not supported"));
		1984	#else
1950	rtl_uString_newFromStr (strError, L"WSAEPROTONOSUPPORT, Protocol not supported");	1985	rtl_uString_newFromStr (strError, L"WSAEPROTONOSUPPORT, Protocol not supported");
		1986	#endif
1951	break;	1987	break;
1952		1988
1953	case WSAESOCKTNOSUPPORT:	1989	case WSAESOCKTNOSUPPORT:
		1990	#ifdef __MINGW32__
		1991	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESOCKTNOSUPPORT, Socket type not supported"));
		1992	#else
1954	rtl_uString_newFromStr (strError, L"WSAESOCKTNOSUPPORT, Socket type not supported");	1993	rtl_uString_newFromStr (strError, L"WSAESOCKTNOSUPPORT, Socket type not supported");
		1994	#endif
1955	break;	1995	break;
1956		1996
1957	case WSAEOPNOTSUPP:	1997	case WSAEOPNOTSUPP:
		1998	#ifdef __MINGW32__
		1999	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEOPNOTSUPP, Operation not supported on socket"));
		2000	#else
1958	rtl_uString_newFromStr (strError, L"WSAEOPNOTSUPP, Operation not supported on socket");	2001	rtl_uString_newFromStr (strError, L"WSAEOPNOTSUPP, Operation not supported on socket");
		2002	#endif
1959	break;	2003	break;
1960		2004
1961	case WSAEPFNOSUPPORT:	2005	case WSAEPFNOSUPPORT:
		2006	#ifdef __MINGW32__
		2007	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPFNOSUPPORT, Protocol family not supported"));
		2008	#else
1962	rtl_uString_newFromStr (strError, L"WSAEPFNOSUPPORT, Protocol family not supported");	2009	rtl_uString_newFromStr (strError, L"WSAEPFNOSUPPORT, Protocol family not supported");
		2010	#endif
1963	break;	2011	break;
1964		2012
1965	case WSAEAFNOSUPPORT:	2013	case WSAEAFNOSUPPORT:
		2014	#ifdef __MINGW32__
		2015	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSEAFNOSUPPORT, Addr family not supported by protocol family"));
		2016	#else
1966	rtl_uString_newFromStr (strError, L"WSEAFNOSUPPORT, Addr family not supported by protocol family");	2017	rtl_uString_newFromStr (strError, L"WSEAFNOSUPPORT, Addr family not supported by protocol family");
		2018	#endif
1967	break;	2019	break;
1968		2020
1969	case WSAEADDRINUSE:	2021	case WSAEADDRINUSE:
		2022	#ifdef __MINGW32__
		2023	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket."));
		2024	#else
1970	rtl_uString_newFromStr (strError, L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket.");	2025	rtl_uString_newFromStr (strError, L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket.");
		2026	#endif
1971	break;	2027	break;
1972		2028
1973	case WSAEADDRNOTAVAIL:	2029	case WSAEADDRNOTAVAIL:
		2030	#ifdef __MINGW32__
		2031	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEADDRNOTAVAIL, Can't assign requested Addr"));
		2032	#else
1974	rtl_uString_newFromStr (strError, L"WSAEADDRNOTAVAIL, Can't assign requested Addr");	2033	rtl_uString_newFromStr (strError, L"WSAEADDRNOTAVAIL, Can't assign requested Addr");
		2034	#endif
1975	break;	2035	break;
1976		2036
1977	case WSAENETDOWN:	2037	case WSAENETDOWN:
		2038	#ifdef __MINGW32__
		2039	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETDOWN, Network is down"));
		2040	#else
1978	rtl_uString_newFromStr (strError, L"WSAENETDOWN, Network is down");	2041	rtl_uString_newFromStr (strError, L"WSAENETDOWN, Network is down");
		2042	#endif
1979	break;	2043	break;
1980		2044
1981	case WSAENETUNREACH:	2045	case WSAENETUNREACH:
		2046	#ifdef __MINGW32__
		2047	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETUNREACH, Network is unreachable"));
		2048	#else
1982	rtl_uString_newFromStr (strError, L"WSAENETUNREACH, Network is unreachable");	2049	rtl_uString_newFromStr (strError, L"WSAENETUNREACH, Network is unreachable");
		2050	#endif
1983	break;	2051	break;
1984		2052
1985	case WSAENETRESET:	2053	case WSAENETRESET:
		2054	#ifdef __MINGW32__
		2055	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETRESET, Network dropped connection or reset"));
		2056	#else
1986	rtl_uString_newFromStr (strError, L"WSAENETRESET, Network dropped connection or reset");	2057	rtl_uString_newFromStr (strError, L"WSAENETRESET, Network dropped connection or reset");
		2058	#endif
1987	break;	2059	break;
1988		2060
1989	case WSAECONNABORTED:	2061	case WSAECONNABORTED:
		2062	#ifdef __MINGW32__
		2063	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNABORTED, Software caused connection abort"));
		2064	#else
1990	rtl_uString_newFromStr (strError, L"WSAECONNABORTED, Software caused connection abort");	2065	rtl_uString_newFromStr (strError, L"WSAECONNABORTED, Software caused connection abort");
		2066	#endif
1991	break;	2067	break;
1992		2068
1993	case WSAECONNRESET:	2069	case WSAECONNRESET:
		2070	#ifdef __MINGW32__
		2071	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNRESET, Connection reset by peer"));
		2072	#else
1994	rtl_uString_newFromStr (strError, L"WSAECONNRESET, Connection reset by peer");	2073	rtl_uString_newFromStr (strError, L"WSAECONNRESET, Connection reset by peer");
		2074	#endif
1995	break;	2075	break;
1996		2076
1997	case WSAENOBUFS:	2077	case WSAENOBUFS:
		2078	#ifdef __MINGW32__
		2079	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOBUFS, No buffer space available."));
		2080	#else
1998	rtl_uString_newFromStr (strError, L"WSAENOBUFS, No buffer space available.");	2081	rtl_uString_newFromStr (strError, L"WSAENOBUFS, No buffer space available.");
		2082	#endif
1999	break;	2083	break;
2000		2084
2001	case WSAEISCONN:	2085	case WSAEISCONN:
		2086	#ifdef __MINGW32__
		2087	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEISCONN, Socket is already connected"));
		2088	#else
2002	rtl_uString_newFromStr (strError, L"WSAEISCONN, Socket is already connected");	2089	rtl_uString_newFromStr (strError, L"WSAEISCONN, Socket is already connected");
		2090	#endif
2003	break;	2091	break;
2004		2092
2005	case WSAENOTCONN:	2093	case WSAENOTCONN:
		2094	#ifdef __MINGW32__
		2095	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTCONN, Socket is not connected"));
		2096	#else
2006	rtl_uString_newFromStr (strError, L"WSAENOTCONN, Socket is not connected");	2097	rtl_uString_newFromStr (strError, L"WSAENOTCONN, Socket is not connected");
		2098	#endif
2007	break;	2099	break;
2008		2100
2009	case WSAESHUTDOWN:	2101	case WSAESHUTDOWN:
		2102	#ifdef __MINGW32__
		2103	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESHUTDOWN, Can't send after socket shutdown"));
		2104	#else
2010	rtl_uString_newFromStr (strError, L"WSAESHUTDOWN, Can't send after socket shutdown");	2105	rtl_uString_newFromStr (strError, L"WSAESHUTDOWN, Can't send after socket shutdown");
		2106	#endif
2011	break;	2107	break;
2012		2108
2013	case WSAETIMEDOUT:	2109	case WSAETIMEDOUT:
		2110	#ifdef __MINGW32__
		2111	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAETIMEDOUT, Connection timed out"));
		2112	#else
2014	rtl_uString_newFromStr (strError, L"WSAETIMEDOUT, Connection timed out");	2113	rtl_uString_newFromStr (strError, L"WSAETIMEDOUT, Connection timed out");
		2114	#endif
2015	break;	2115	break;
2016		2116
2017	case WSAECONNREFUSED:	2117	case WSAECONNREFUSED:
		2118	#ifdef __MINGW32__
		2119	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNREFUSED, Connection refused"));
		2120	#else
2018	rtl_uString_newFromStr (strError, L"WSAECONNREFUSED, Connection refused");	2121	rtl_uString_newFromStr (strError, L"WSAECONNREFUSED, Connection refused");
		2122	#endif
2019	break;	2123	break;
2020		2124
2021	case WSAEHOSTDOWN:	2125	case WSAEHOSTDOWN:
		2126	#ifdef __MINGW32__
		2127	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEHOSTDOWN, Networking subsystem not started"));
		2128	#else
2022	rtl_uString_newFromStr (strError, L"WSAEHOSTDOWN, Networking subsystem not started");	2129	rtl_uString_newFromStr (strError, L"WSAEHOSTDOWN, Networking subsystem not started");
		2130	#endif
2023	break;	2131	break;
2024		2132
2025	case WSAEHOSTUNREACH:	2133	case WSAEHOSTUNREACH:
		2134	#ifdef __MINGW32__
		2135	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEHOSTUNREACH, No route to host"));
		2136	#else
2026	rtl_uString_newFromStr (strError, L"WSAEHOSTUNREACH, No route to host");	2137	rtl_uString_newFromStr (strError, L"WSAEHOSTUNREACH, No route to host");
		2138	#endif
2027	break;	2139	break;
2028		2140
2029	case WSAEWOULDBLOCK:	2141	case WSAEWOULDBLOCK:
		2142	#ifdef __MINGW32__
		2143	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEWOULDBLOCK, Operation would block"));
		2144	#else
2030	rtl_uString_newFromStr (strError, L"WSAEWOULDBLOCK, Operation would block");	2145	rtl_uString_newFromStr (strError, L"WSAEWOULDBLOCK, Operation would block");
		2146	#endif
2031	break;	2147	break;
2032		2148
2033	case WSAEINPROGRESS:	2149	case WSAEINPROGRESS:
		2150	#ifdef __MINGW32__
		2151	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEINPROGRESS, Operation now in progress"));
		2152	#else
2034	rtl_uString_newFromStr (strError, L"WSAEINPROGRESS, Operation now in progress");	2153	rtl_uString_newFromStr (strError, L"WSAEINPROGRESS, Operation now in progress");
		2154	#endif
2035	break;	2155	break;
2036		2156
2037	case WSAEALREADY:	2157	case WSAEALREADY:
		2158	#ifdef __MINGW32__
		2159	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEALREADY, Operation already in progress"));
		2160	#else
2038	rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation already in progress");	2161	rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation already in progress");
		2162	#endif
2039	break;	2163	break;
2040		2164
2041	case WSAEINTR:	2165	case WSAEINTR:
		2166	#ifdef __MINGW32__
		2167	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEALREADY, Operation was interrupted"));
		2168	#else
2042	rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation was interrupted");	2169	rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation was interrupted");
		2170	#endif
2043	break;	2171	break;
2044		2172
2045	case WSAEBADF:	2173	case WSAEBADF:
		2174	#ifdef __MINGW32__
		2175	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEBADF, Bad file number"));
		2176	#else
2046	rtl_uString_newFromStr (strError, L"WSAEBADF, Bad file number");	2177	rtl_uString_newFromStr (strError, L"WSAEBADF, Bad file number");
		2178	#endif
2047	break;	2179	break;
2048		2180
2049	case WSAEACCES:	2181	case WSAEACCES:
		2182	#ifdef __MINGW32__
		2183	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEACCES, Access is denied"));
		2184	#else
2050	rtl_uString_newFromStr (strError, L"WSAEACCES, Access is denied");	2185	rtl_uString_newFromStr (strError, L"WSAEACCES, Access is denied");
		2186	#endif
2051	break;	2187	break;
2052		2188
2053	case WSAEFAULT:	2189	case WSAEFAULT:
		2190	#ifdef __MINGW32__
		2191	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEFAULT, Bad memory Addr"));
		2192	#else
2054	rtl_uString_newFromStr (strError, L"WSAEFAULT, Bad memory Addr");	2193	rtl_uString_newFromStr (strError, L"WSAEFAULT, Bad memory Addr");
		2194	#endif
2055	break;	2195	break;
2056		2196
2057	case WSAEINVAL:	2197	case WSAEINVAL:
		2198	#ifdef __MINGW32__
		2199	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEINVAL, The socket has not been bound with bind() or is already connected"));
		2200	#else
2058	rtl_uString_newFromStr (strError, L"WSAEINVAL, The socket has not been bound with bind() or is already connected");	2201	rtl_uString_newFromStr (strError, L"WSAEINVAL, The socket has not been bound with bind() or is already connected");
		2202	#endif
2059	break;	2203	break;
2060		2204
2061	case WSAEMFILE:	2205	case WSAEMFILE:
		2206	#ifdef __MINGW32__
		2207	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEMFILE, No more file descriptors are available"));
		2208	#else
2062	rtl_uString_newFromStr (strError, L"WSAEMFILE, No more file descriptors are available");	2209	rtl_uString_newFromStr (strError, L"WSAEMFILE, No more file descriptors are available");
		2210	#endif
2063	break;	2211	break;
2064		2212
2065	case WSAETOOMANYREFS:	2213	case WSAETOOMANYREFS:
		2214	#ifdef __MINGW32__
		2215	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAETOOMANYREFS, Undocumented WinSock error"));
		2216	#else
2066	rtl_uString_newFromStr (strError, L"WSAETOOMANYREFS, Undocumented WinSock error");	2217	rtl_uString_newFromStr (strError, L"WSAETOOMANYREFS, Undocumented WinSock error");
		2218	#endif
2067	break;	2219	break;
2068		2220
2069	case WSAENAMETOOLONG:	2221	case WSAENAMETOOLONG:
		2222	#ifdef __MINGW32__
		2223	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENAMETOOLONG, Undocumented WinSock error"));
		2224	#else
2070	rtl_uString_newFromStr (strError, L"WSAENAMETOOLONG, Undocumented WinSock error");	2225	rtl_uString_newFromStr (strError, L"WSAENAMETOOLONG, Undocumented WinSock error");
		2226	#endif
2071	break;	2227	break;
2072		2228
2073	case WSAENOTEMPTY:	2229	case WSAENOTEMPTY:
		2230	#ifdef __MINGW32__
		2231	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTEMPTY, Undocumented WinSock error"));
		2232	#else
2074	rtl_uString_newFromStr (strError, L"WSAENOTEMPTY, Undocumented WinSock error");	2233	rtl_uString_newFromStr (strError, L"WSAENOTEMPTY, Undocumented WinSock error");
		2234	#endif
2075	break;	2235	break;
2076		2236
2077	case WSAEPROCLIM:	2237	case WSAEPROCLIM:
		2238	#ifdef __MINGW32__
		2239	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROCLIM, Undocumented WinSock error"));
		2240	#else
2078	rtl_uString_newFromStr (strError, L"WSAEPROCLIM, Undocumented WinSock error");	2241	rtl_uString_newFromStr (strError, L"WSAEPROCLIM, Undocumented WinSock error");
		2242	#endif
2079	break;	2243	break;
2080		2244
2081	case WSAEUSERS:	2245	case WSAEUSERS:
		2246	#ifdef __MINGW32__
		2247	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEUSERS, Undocumented WinSock error"));
		2248	#else
2082	rtl_uString_newFromStr (strError, L"WSAEUSERS, Undocumented WinSock error");	2249	rtl_uString_newFromStr (strError, L"WSAEUSERS, Undocumented WinSock error");
		2250	#endif
2083	break;	2251	break;
2084		2252
2085	case WSAEDQUOT:	2253	case WSAEDQUOT:
		2254	#ifdef __MINGW32__
		2255	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDQUOT, Undocumented WinSock error"));
		2256	#else
2086	rtl_uString_newFromStr (strError, L"WSAEDQUOT, Undocumented WinSock error");	2257	rtl_uString_newFromStr (strError, L"WSAEDQUOT, Undocumented WinSock error");
		2258	#endif
2087	break;	2259	break;
2088		2260
2089	case WSAESTALE:	2261	case WSAESTALE:
		2262	#ifdef __MINGW32__
		2263	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESTALE, Undocumented WinSock error"));
		2264	#else
2090	rtl_uString_newFromStr (strError, L"WSAESTALE, Undocumented WinSock error");	2265	rtl_uString_newFromStr (strError, L"WSAESTALE, Undocumented WinSock error");
		2266	#endif
2091	break;	2267	break;
2092		2268
2093	case WSAEREMOTE:	2269	case WSAEREMOTE:
		2270	#ifdef __MINGW32__
		2271	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEREMOTE, Undocumented WinSock error"));
		2272	#else
2094	rtl_uString_newFromStr (strError, L"WSAEREMOTE, Undocumented WinSock error");	2273	rtl_uString_newFromStr (strError, L"WSAEREMOTE, Undocumented WinSock error");
		2274	#endif
2095	break;	2275	break;
2096		2276
2097	case WSAEDISCON:	2277	case WSAEDISCON:
		2278	#ifdef __MINGW32__
		2279	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDISCON, Circuit was gracefully terminated"));
		2280	#else
2098	rtl_uString_newFromStr (strError, L"WSAEDISCON, Circuit was gracefully terminated");	2281	rtl_uString_newFromStr (strError, L"WSAEDISCON, Circuit was gracefully terminated");
		2282	#endif
2099	break;	2283	break;
2100		2284
2101	case WSASYSNOTREADY:	2285	case WSASYSNOTREADY:
		2286	#ifdef __MINGW32__
		2287	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication"));
		2288	#else
2102	rtl_uString_newFromStr (strError, L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication");	2289	rtl_uString_newFromStr (strError, L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication");
		2290	#endif
2103	break;	2291	break;
2104		2292
2105	case WSAVERNOTSUPPORTED:	2293	case WSAVERNOTSUPPORTED:
		2294	#ifdef __MINGW32__
		2295	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAVERNOTSUPPORTED, The version of Windows Sockets API support requested is not provided by this particular Windows Sockets implementation"));
		2296	#else
2106	rtl_uString_newFromStr (strError, L"WSAVERNOTSUPPORTED, The version of Windows Sockets API support requested is not provided by this particular Windows Sockets implementation");	2297	rtl_uString_newFromStr (strError, L"WSAVERNOTSUPPORTED, The version of Windows Sockets API support requested is not provided by this particular Windows Sockets implementation");
		2298	#endif
2107	break;	2299	break;
2108		2300
2109	case WSANOTINITIALISED:	2301	case WSANOTINITIALISED:
		2302	#ifdef __MINGW32__
		2303	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANOTINITIALISED, WSAStartup() has not been called"));
		2304	#else
2110	rtl_uString_newFromStr (strError, L"WSANOTINITIALISED, WSAStartup() has not been called");	2305	rtl_uString_newFromStr (strError, L"WSANOTINITIALISED, WSAStartup() has not been called");
		2306	#endif
2111	break;	2307	break;
2112		2308
2113	case WSAHOST_NOT_FOUND:	2309	case WSAHOST_NOT_FOUND:
		2310	#ifdef __MINGW32__
		2311	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAHOST_NOT_FOUND, Authoritative answer host not found"));
		2312	#else
2114	rtl_uString_newFromStr (strError, L"WSAHOST_NOT_FOUND, Authoritative answer host not found");	2313	rtl_uString_newFromStr (strError, L"WSAHOST_NOT_FOUND, Authoritative answer host not found");
		2314	#endif
2115	break;	2315	break;
2116		2316
2117	case WSATRY_AGAIN:	2317	case WSATRY_AGAIN:
		2318	#ifdef __MINGW32__
		2319	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL"));
		2320	#else
2118	rtl_uString_newFromStr (strError, L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL");	2321	rtl_uString_newFromStr (strError, L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL");
		2322	#endif
2119	break;	2323	break;
2120		2324
2121	case WSANO_RECOVERY:	2325	case WSANO_RECOVERY:
		2326	#ifdef __MINGW32__
		2327	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP"));
		2328	#else
2122	rtl_uString_newFromStr (strError, L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP");	2329	rtl_uString_newFromStr (strError, L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP");
		2330	#endif
2123	break;	2331	break;
2124		2332
2125	case WSANO_DATA:	2333	case WSANO_DATA:
		2334	#ifdef __MINGW32__
		2335	rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type"));
		2336	#else
2126	rtl_uString_newFromStr (strError, L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type");	2337	rtl_uString_newFromStr (strError, L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type");
		2338	#endif
2127	break;	2339	break;
2128		2340
2129	default:	2341	default:
2130	{	2342	{
2131	sal_Unicode message[128];	2343	sal_Unicode message[128];
2132		2344
		2345	#ifdef __MINGW32__
		2346	wsprintfW((wchar_t *)message, L"Unknown WinSock Error Number %d", error);
		2347	rtl_uString_newFromStr (strError, message);
		2348	#else
2133	wsprintfW((sal_Unicode )message, (sal_Unicode )L"Unknown WinSock Error Number %d", error);	2349	wsprintfW((sal_Unicode )message, (sal_Unicode )L"Unknown WinSock Error Number %d", error);
2134	rtl_uString_newFromStr (strError, message);	2350	rtl_uString_newFromStr (strError, message);
		2351	#endif
2135	}	2352	}
2136		2353
2137	return;	2354	return;

Lines 71-76 Link Here

(-)./sal/inc/systools/win32/uwinapi.h.orig (+7 lines)
71	# include <windows.h>	71	# include <windows.h>
72	#endif	72	#endif
73		73
		74	#ifdef __MINGW32__
		75	#include <basetyps.h>
		76	#ifdef _UWINAPI_
		77	#define WINBASEAPI
		78	#endif
		79	#endif
		80
74	/** GetUserDomain	81	/** GetUserDomain
75		82
76	The GetUserDomain function retrieves the name of the NT domain the user is	83	The GetUserDomain function retrieves the name of the NT domain the user is

Lines 95-101 Link Here

(-)./sal/inc/sal/types.h.orig (-3 / +8 lines)
95	typedef char sal_Char;	95	typedef char sal_Char;
96	typedef signed char sal_sChar;	96	typedef signed char sal_sChar;
97	typedef unsigned char sal_uChar;	97	typedef unsigned char sal_uChar;
98	#if defined(SAL_W32)	98	#if defined(SAL_W32) && !defined(__MINGW32__)
99	typedef wchar_t sal_Unicode;	99	typedef wchar_t sal_Unicode;
100	#else	100	#else
101	#define SAL_UNICODE_NOTEQUAL_WCHAR_T	101	#define SAL_UNICODE_NOTEQUAL_WCHAR_T
Lines 111-120 Link Here
111	#define SAL_MAX_ENUM 0x7fff	111	#define SAL_MAX_ENUM 0x7fff
112	#endif	112	#endif
113		113
114	#ifdef _MSC_VER	114	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
115	# define SAL_DLLEXPORT __declspec(dllexport)	115	# define SAL_DLLEXPORT __declspec(dllexport)
		116	#if defined(_MSC_VER)
116	# define SAL_CALL __cdecl	117	# define SAL_CALL __cdecl
117	# define SAL_CALL_ELLIPSE __cdecl	118	# define SAL_CALL_ELLIPSE __cdecl
		119	#else
		120	# define SAL_CALL
		121	# define SAL_CALL_ELLIPSE
		122	#endif
118	#elif defined SAL_OS2	123	#elif defined SAL_OS2
119	# define SAL_DLLEXPORT	124	# define SAL_DLLEXPORT
120	# define SAL_CALL	125	# define SAL_CALL
Lines 135-141 Link Here
135	This hinders the compiler from setting a generic vtable stating that	140	This hinders the compiler from setting a generic vtable stating that
136	a pure virtual function was called and thus slightly reduces code size.	141	a pure virtual function was called and thus slightly reduces code size.
137	*/	142	*/
138	#ifdef _MSC_VER	143	#if defined(_MSC_VER) \|\| !defined(__MINGW32__)
139	#define SAL_NO_VTABLE __declspec(novtable)	144	#define SAL_NO_VTABLE __declspec(novtable)
140	#else	145	#else
141	#define SAL_NO_VTABLE	146	#define SAL_NO_VTABLE

Lines 99-110 Link Here

(-)./sal/inc/sal/config.h.orig (-1 / +5 lines)
99	#endif	99	#endif
100	#endif /* defined _MSC_VER < 1300 */	100	#endif /* defined _MSC_VER < 1300 */
101		101
		102	#endif /* defined _MSC_VER */
		103
102	/* Provide ISO C99 compatible versions of snprint and vsnprintf */	104	/* Provide ISO C99 compatible versions of snprint and vsnprintf */
		105	#ifdef __MINGW32__
		106	#define _SNPRINTF_DLLIMPORT
		107	#endif
103	#ifndef _SNPRINTF_H	108	#ifndef _SNPRINTF_H
104	#include <systools/win32/snprintf.h>	109	#include <systools/win32/snprintf.h>
105	#endif	110	#endif
106		111
107	#endif /* defined _MSC_VER */
108	#endif /* defined WIN32 */	112	#endif /* defined WIN32 */
109		113
110	/* BR: 16bit fuer Borland-Compiler */	114	/* BR: 16bit fuer Borland-Compiler */

Lines 5-10 Link Here

(-)./sj2/prj/d.lst.orig (+1 lines)
5		5
6	..\%__SRC%\lib\sj.lib %_DEST%\lib%_EXT%\sj.lib	6	..\%__SRC%\lib\sj.lib %_DEST%\lib%_EXT%\sj.lib
7	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	7	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		8	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
8	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	9	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
9	..\%__SRC%\slb\sj.lib %_DEST%\lib%_EXT%\xsj.lib	10	..\%__SRC%\slb\sj.lib %_DEST%\lib%_EXT%\xsj.lib
10	..\%__SRC%\bin\j?????_g.dll %_DEST%\bin%_EXT%\j?????_g.dll	11	..\%__SRC%\bin\j?????_g.dll %_DEST%\bin%_EXT%\j?????_g.dll

Lines 68-73 Link Here

(-)./so3/source/ole/helpers.cxx.orig (+2 lines)
68		68
69	#define ARRAYSIZE(a) (sizeof(a)/sizeof(a[0]))	69	#define ARRAYSIZE(a) (sizeof(a)/sizeof(a[0]))
70		70
		71	static BOOL GetFileTimes(LPTSTR pszFileName, FILETIME *pft);
		72
71	/*	73	/*
72	* StarObject_MetafilePictIconFree	74	* StarObject_MetafilePictIconFree
73	*	75	*

Lines 159-164 Link Here

(-)./so3/source/ole/soole.h.orig (-1 / +158 lines)
159	#endif //OLECHAR	159	#endif //OLECHAR
160	#endif //_WIN32	160	#endif //_WIN32
161		161
		162	#endif //_OLE2_H_
		163
		164	#if defined(_OLE2_H_) \|\| defined(__MINGW32__) //May not include ole2.h at all times.
162		165
163	//Useful macros.	166	//Useful macros.
164	#define SETFormatEtc(fe, cf, asp, td, med, li) \	167	#define SETFormatEtc(fe, cf, asp, td, med, li) \
Lines 501-506 Link Here
501		504
502	#endif	505	#endif
503		506
504	BOOL GetFileTimes(LPTSTR, FILETIME *);	507	// BOOL GetFileTimes(LPTSTR, FILETIME *);
		508
		509	#ifdef __MINGW32__
		510
		511	typedef
		512	enum tagOLEMISC
		513	{ OLEMISC_RECOMPOSEONRESIZE = 0x1,
		514	OLEMISC_ONLYICONIC = 0x2,
		515	OLEMISC_INSERTNOTREPLACE = 0x4,
		516	OLEMISC_STATIC = 0x8,
		517	OLEMISC_CANTLINKINSIDE = 0x10,
		518	OLEMISC_CANLINKBYOLE1 = 0x20,
		519	OLEMISC_ISLINKOBJECT = 0x40,
		520	OLEMISC_INSIDEOUT = 0x80,
		521	OLEMISC_ACTIVATEWHENVISIBLE = 0x100,
		522	OLEMISC_RENDERINGISDEVICEINDEPENDENT = 0x200,
		523	OLEMISC_INVISIBLEATRUNTIME = 0x400,
		524	OLEMISC_ALWAYSRUN = 0x800,
		525	OLEMISC_ACTSLIKEBUTTON = 0x1000,
		526	OLEMISC_ACTSLIKELABEL = 0x2000,
		527	OLEMISC_NOUIACTIVATE = 0x4000,
		528	OLEMISC_ALIGNABLE = 0x8000,
		529	OLEMISC_SIMPLEFRAME = 0x10000,
		530	OLEMISC_SETCLIENTSITEFIRST = 0x20000,
		531	OLEMISC_IMEMODE = 0x40000,
		532	OLEMISC_IGNOREACTIVATEWHENVISIBLE = 0x80000,
		533	OLEMISC_WANTSTOMENUMERGE = 0x100000,
		534	OLEMISC_SUPPORTSMULTILEVELUNDO = 0x200000
		535	} OLEMISC;
		536
		537	typedef interface IOleCache IOleCache;
		538	typedef interface IOleLink IOleLink;
		539
		540	typedef /* [unique] / IOleCache LPOLECACHE;
		541
		542
		543	EXTERN_C const IID IID_IOleCache;
		544
		545	MIDL_INTERFACE("0000011e-0000-0000-C000-000000000046")
		546	IOleCache : public IUnknown
		547	{
		548	public:
		549	virtual HRESULT STDMETHODCALLTYPE Cache(
		550	/* [unique][in] / FORMATETC pformatetc,
		551	/* [in] */ DWORD advf,
		552	/* [out] / DWORD pdwConnection) = 0;
		553
		554	virtual HRESULT STDMETHODCALLTYPE Uncache(
		555	/* [in] */ DWORD dwConnection) = 0;
		556
		557	virtual HRESULT STDMETHODCALLTYPE EnumCache(
		558	/* [out] / IEnumSTATDATA *ppenumSTATDATA) = 0;
		559
		560	virtual HRESULT STDMETHODCALLTYPE InitCache(
		561	/* [unique][in] / IDataObject pDataObject) = 0;
		562
		563	virtual HRESULT STDMETHODCALLTYPE SetData(
		564	/* [unique][in] / FORMATETC pformatetc,
		565	/* [unique][in] / STGMEDIUM pmedium,
		566	/* [in] */ BOOL fRelease) = 0;
		567
		568	};
		569
		570	typedef /* [unique] / IOleLink LPOLELINK;
		571
572	typedef
573	enum tagOLEUPDATE
574	{ OLEUPDATE_ALWAYS = 1,
575	OLEUPDATE_ONCALL = 3
576	} OLEUPDATE;
577
578	typedef OLEUPDATE *LPOLEUPDATE;
579
580	typedef OLEUPDATE *POLEUPDATE;
581
582	typedef
583	enum tagOLELINKBIND
584	{ OLELINKBIND_EVENIFCLASSDIFF = 1
585	} OLELINKBIND;
586
587
588	EXTERN_C const IID IID_IOleLink;
589
590	MIDL_INTERFACE("0000011d-0000-0000-C000-000000000046")
591	IOleLink : public IUnknown
592	{
593	public:
594	virtual HRESULT STDMETHODCALLTYPE SetUpdateOptions(
595	/* [in] */ DWORD dwUpdateOpt) = 0;
596
597	virtual HRESULT STDMETHODCALLTYPE GetUpdateOptions(
598	/* [out] / DWORD pdwUpdateOpt) = 0;
599
600	virtual HRESULT STDMETHODCALLTYPE SetSourceMoniker(
601	/* [unique][in] / IMoniker pmk,
602	/* [in] */ REFCLSID rclsid) = 0;
603
604	virtual HRESULT STDMETHODCALLTYPE GetSourceMoniker(
605	/* [out] / IMoniker *ppmk) = 0;
606
607	virtual HRESULT STDMETHODCALLTYPE SetSourceDisplayName(
608	/* [in] */ LPCOLESTR pszStatusText) = 0;
609
610	virtual HRESULT STDMETHODCALLTYPE GetSourceDisplayName(
611	/* [out] / LPOLESTR ppszDisplayName) = 0;
612
613	virtual HRESULT STDMETHODCALLTYPE BindToSource(
614	/* [in] */ DWORD bindflags,
615	/* [unique][in] / IBindCtx pbc) = 0;
616
617	virtual HRESULT STDMETHODCALLTYPE BindIfRunning( void) = 0;
618
619	virtual HRESULT STDMETHODCALLTYPE GetBoundSource(
620	/* [out] / IUnknown *ppunk) = 0;
621
622	virtual HRESULT STDMETHODCALLTYPE UnbindSource( void) = 0;
623
624	virtual HRESULT STDMETHODCALLTYPE Update(
625	/* [unique][in] / IBindCtx pbc) = 0;
626
627	};
628
629	typedef
630	enum tagOLERENDER
631	{ OLERENDER_NONE = 0,
632	OLERENDER_DRAW = 1,
633	OLERENDER_FORMAT = 2,
634	OLERENDER_ASIS = 3
635	} OLERENDER;
636
637	typedef OLERENDER *LPOLERENDER;
638
639	typedef struct tagOBJECTDESCRIPTOR
640	{
641	ULONG cbSize;
642	CLSID clsid;
643	DWORD dwDrawAspect;
644	SIZEL sizel;
645	POINTL pointl;
646	DWORD dwStatus;
647	DWORD dwFullUserTypeName;
648	DWORD dwSrcOfCopy;
649	} OBJECTDESCRIPTOR;
650
651	typedef struct tagOBJECTDESCRIPTOR *POBJECTDESCRIPTOR;
652
653	typedef struct tagOBJECTDESCRIPTOR *LPOBJECTDESCRIPTOR;
654
655	typedef struct tagOBJECTDESCRIPTOR LINKSRCDESCRIPTOR;
656
657	typedef struct tagOBJECTDESCRIPTOR *PLINKSRCDESCRIPTOR;
658
659	typedef struct tagOBJECTDESCRIPTOR *LPLINKSRCDESCRIPTOR;
660
661	#endif
505		662
506	#endif //_StarObject_H_	663	#endif //_StarObject_H_

Lines 841-847 Link Here

(-)./so3/source/misc/factory.cxx.orig (-1 / +1 lines)
841	#ifdef WNT	841	#ifdef WNT
842	if( !Find( GetAutoConvertTo( pStor->GetClassName() ) ) )	842	if( !Find( GetAutoConvertTo( pStor->GetClassName() ) ) )
843	{	843	{
844	return SvOutPlaceObject::CreateFromData( xTrans, pStor );	844	return SvObjectRef(SvOutPlaceObject::CreateFromData( xTrans, pStor ));
845	}	845	}
846	#endif	846	#endif
847	return SvObjectRef();	847	return SvObjectRef();

Lines 103-108 Link Here

(-)./so3/source/inplace/outplace.cxx.orig (-9 / +16 lines)
103	#include <com/sun/star/datatransfer/XTransferable.hpp>	103	#include <com/sun/star/datatransfer/XTransferable.hpp>
104	#endif	104	#endif
105	#include <svtools/wmf.hxx>	105	#include <svtools/wmf.hxx>
		106	#ifdef __MINGW32__
		107	typedef /* [v1_enum] */
		108	enum tagOLEVERBATTRIB
		109	{ OLEVERBATTRIB_NEVERDIRTIES = 1,
		110	OLEVERBATTRIB_ONCONTAINERMENU = 2
		111	} OLEVERBATTRIB;
		112	#endif
106		113
107	using namespace vos;	114	using namespace vos;
108	using namespace ::com::sun::star::uno;	115	using namespace ::com::sun::star::uno;
Lines 465-471 Link Here
465	const SvVerbList & SvOutPlaceObject::GetVerbList() const	472	const SvVerbList & SvOutPlaceObject::GetVerbList() const
466	/* [Beschreibung]	473	/* [Beschreibung]
467		474
468	Liefert eine Liste der Aktionen zurück, die auf diesem Objekt ausgeführt werden können.	475	Liefert eine Liste der Aktionen zurk, die auf diesem Objekt ausgefrt werden knen.
469	*/	476	*/
470	{	477	{
471	#ifdef WNT	478	#ifdef WNT
Lines 689-695 Link Here
689		696
690	OModule aOleDlgLib;	697	OModule aOleDlgLib;
691	if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) )	698	if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) )
692	return xRet;	699	return SvInPlaceObjectRef(xRet);
693		700
694	#ifdef UNICODE	701	#ifdef UNICODE
695	OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *)	702	OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *)
Lines 699-705 Link Here
699	aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) );	706	aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) );
700	#endif	707	#endif
701	if( !pInsertFct )	708	if( !pInsertFct )
702	return xRet;	709	return SvInPlaceObjectRef(xRet);
703		710
704	//uTemp=pInsertFct(&io);	711	//uTemp=pInsertFct(&io);
705	//uTemp=OleUIInsertObject(&io);	712	//uTemp=OleUIInsertObject(&io);
Lines 841-847 Link Here
841		848
842	OModule aOleDlgLib;	849	OModule aOleDlgLib;
843	if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) )	850	if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) )
844	return xRet;	851	return SvInPlaceObjectRef(xRet);
845		852
846	#ifdef UNICODE	853	#ifdef UNICODE
847	OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *)	854	OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *)
Lines 851-857 Link Here
851	aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) );	858	aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) );
852	#endif	859	#endif
853	if( !pInsertFct )	860	if( !pInsertFct )
854	return xRet;	861	return SvInPlaceObjectRef(xRet);
855		862
856	uTemp=pInsertFct(&io);	863	uTemp=pInsertFct(&io);
857	//uTemp=OleUIInsertObject(&io);	864	//uTemp=OleUIInsertObject(&io);
Lines 876-882 Link Here
876	bIsInternal = TRUE;	883	bIsInternal = TRUE;
877	rTypeName = pInternalServer->GetHumanName();	884	rTypeName = pInternalServer->GetHumanName();
878	rInternalClassName = pInternalServer->GetClassName();	885	rInternalClassName = pInternalServer->GetClassName();
879	return xRet;	886	return SvInPlaceObjectRef(xRet);
880	}	887	}
881		888
882	tType=TENANTTYPE_EMBEDDEDOBJECT;	889	tType=TENANTTYPE_EMBEDDEDOBJECT;
Lines 905-911 Link Here
905	// so it will be inserted without actuall OLE embedding	912	// so it will be inserted without actuall OLE embedding
906		913
907	bIsInternal = TRUE;	914	bIsInternal = TRUE;
908	return xRet;	915	return SvInPlaceObjectRef(xRet);
909	}	916	}
910	}	917	}
911		918
Lines 978-984 Link Here
978	else	985	else
979	{	986	{
980	pDO->Release();	987	pDO->Release();
981	return xRet;	988	return SvInPlaceObjectRef(xRet);
982	}	989	}
983		990
984		991
Lines 1050-1056 Link Here
1050	else	1057	else
1051	{	1058	{
1052	pDO->Release();	1059	pDO->Release();
1053	return xRet;	1060	return SvInPlaceObjectRef(xRet);
1054	}	1061	}
1055	xRet = new SvOutPlaceObject();	1062	xRet = new SvOutPlaceObject();
1056	xRet->DoInitNew( pIStorage );	1063	xRet->DoInitNew( pIStorage );

Lines 1-6 Link Here

(-)./so3/prj/d.lst.orig (+1 lines)
1	touch: ..\%__SRC%\misc\so3.hid %_DEST%\bin%_EXT%\so3.hid	1	touch: ..\%__SRC%\misc\so3.hid %_DEST%\bin%_EXT%\so3.hid
2	..\%__SRC%\lib\so2.lib %_DEST%\lib%_EXT%\so2.lib	2	..\%__SRC%\lib\so2.lib %_DEST%\lib%_EXT%\so2.lib
3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	3	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		4	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
5	..\%__SRC%\srs\src.srs %_DEST%\res%_EXT%\so2.srs	6	..\%__SRC%\srs\src.srs %_DEST%\res%_EXT%\so2.srs
6	..\%__SRC%\bin\.tlb %_DEST%\bin%_EXT%\.tlb	7	..\%__SRC%\bin\.tlb %_DEST%\bin%_EXT%\.tlb

Lines 1-5 Link Here

(-)./forms/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
5	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 1-5 Link Here

(-)./UnoControls/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	4	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
4	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res	5	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res
5	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	6	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib

Lines 165-170 Link Here

(-)./rsc/source/tools/rsctools.cxx.orig (+2 lines)
165	return ByteString( tmpnam( NULL ) );	165	return ByteString( tmpnam( NULL ) );
166	#elif MACOSX	166	#elif MACOSX
167	return ByteString( macxp_tempnam( NULL, NULL ) );	167	return ByteString( macxp_tempnam( NULL, NULL ) );
		168	#elif defined(__MINGW32__)
		169	return ByteString( tempnam( (const char *) _P_tmpdir, NULL ) );
168	#else	170	#else
169	return ByteString( tempnam( (const char *) P_tmpdir, NULL ) );	171	return ByteString( tempnam( (const char *) P_tmpdir, NULL ) );
170	#endif	172	#endif

Lines 80-86 Link Here

(-)./rsc/source/prj/gui.cxx.orig (-2 / +2 lines)
80	/* */	80	/* */
81	/* Description : Gibt die Temporaeren Dateien frei. */	81	/* Description : Gibt die Temporaeren Dateien frei. */
82	/****************************************************************/	82	/****************************************************************/
83	#if defined( UNX ) \|\| ( defined( PM2 ) && ( defined( TCPP ) \|\| defined ( GCC )) ) \|\| defined( MAC ) \|\| defined (WTC) \|\| defined (MTW)	83	#if defined( UNX ) \|\| ( defined( PM2 ) && ( defined( TCPP ) \|\| defined ( GCC )) ) \|\| defined( MAC ) \|\| defined (WTC) \|\| defined (MTW) \|\| defined(__MINGW32__)
84	void ExitProgram( void ){	84	void ExitProgram( void ){
85	#else	85	#else
86	#if defined( CSET )	86	#if defined( CSET )
Lines 105-111 Link Here
105	}	105	}
106		106
107		107
108	#if defined( UNX ) \|\| defined( MAC ) \|\| ( defined( PM2 ) && ( defined( CSET ) \|\| defined ( GCC ))) \|\| defined (WTC) \|\| defined(ICC)	108	#if defined( UNX ) \|\| defined( MAC ) \|\| ( defined( PM2 ) && ( defined( CSET ) \|\| defined ( GCC ))) \|\| defined (WTC) \|\| defined(ICC) \|\| defined(__MINGW32__)
109	int main ( int argc, char ** argv) {	109	int main ( int argc, char ** argv) {
110	#else	110	#else
111	#if defined( MTW )	111	#if defined( MTW )

Lines 302-308 Link Here

(-)./rsc/source/prj/start.cxx.orig (-1 / +1 lines)
302	\|* Letzte Aenderung MM 05.09.91	302	\|* Letzte Aenderung MM 05.09.91
303	\|*	303	\|*
304	*************************************************************************/	304	*************************************************************************/
305	#if defined UNX \|\| (defined PM2 && (defined CSET \|\| defined GCC )) \|\| defined WTC \|\| defined MTW \|\| defined ICC	305	#if defined UNX \|\| (defined PM2 && (defined CSET \|\| defined GCC )) \|\| defined WTC \|\| defined MTW \|\| defined ICC \|\| defined(__MINGW32__)
306	int main ( int argc, char ** argv)	306	int main ( int argc, char ** argv)
307	{	307	{
308	#else	308	#else




#ifndef _SV_SVAPP_HXX
#include <svapp.hxx>
#endif
#ifdef __MINGW32__

#define SM_XVIRTUALSCREEN       76
#define SM_YVIRTUALSCREEN       77
#define SM_CXVIRTUALSCREEN      78
#define SM_CYVIRTUALSCREEN      79
#define SM_CMONITORS            80
#define SM_SAMEDISPLAYFORMAT    81

// HMONITOR is already declared if WINVER >= 0x0500 in windef.h
// This is for components built with an older version number.
//
#if !defined(HMONITOR_DECLARED) && (WINVER < 0x0500)
DECLARE_HANDLE(HMONITOR);
#define HMONITOR_DECLARED
#endif

#ifndef CCHDEVICENAME
#define CCHDEVICENAME 32
#endif

#ifndef DISPLAY_DEVICE_ATTACHED_TO_DESKTOP
#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001
#define DISPLAY_DEVICE_MULTI_DRIVER        0x00000002
#define DISPLAY_DEVICE_PRIMARY_DEVICE      0x00000004
#define DISPLAY_DEVICE_MIRRORING_DRIVER    0x00000008
#define DISPLAY_DEVICE_VGA_COMPATIBLE      0x00000010
#endif
#endif
#define COMPILE_MULTIMON_STUBS
#include <multimon.h>



    StyleSettings aStyleSettings = rSettings.GetStyleSettings();
    BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE | STYLE_OPTION_UNIXSTYLE)) == 0;
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
    aStyleSettings.SetScrollBarSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); // #99956# do not allow huge scrollbars, most of the UI is not scaled anymore
    aStyleSettings.SetSpinSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) );
#else

Lines 721-727 Link Here

(-)./vcl/win/source/gdi/winlayout.cxx.orig (-1 / +1 lines)
721	Point aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) );	721	Point aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) );
722		722
723	// #108267#, limit the number of glyphs to avoid paint errors	723	// #108267#, limit the number of glyphs to avoid paint errors
724	#if (_MSC_VER < 1300)	724	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
725	UINT limitedGlyphCount = std::min( 8192, mnGlyphCount );	725	UINT limitedGlyphCount = std::min( 8192, mnGlyphCount );
726	#else	726	#else
727	UINT limitedGlyphCount = min( 8192, mnGlyphCount );	727	UINT limitedGlyphCount = min( 8192, mnGlyphCount );

Lines 63-68 Link Here

(-)./vcl/win/source/gdi/salprn.cxx.orig (+3 lines)
63	#ifndef _SVWIN_H	63	#ifndef _SVWIN_H
64	#include <tools/svwin.h>	64	#include <tools/svwin.h>
65	#endif	65	#endif
		66	#ifdef __MINGW32__
		67	#define DC_COLLATE 22
		68	#endif
66		69
67	#define _SV_SALPRN_CXX	70	#define _SV_SALPRN_CXX
68		71

Lines 476-482 Link Here

(-)./vcl/win/source/gdi/salgdi3.cxx.orig (-2 / +22 lines)
476	void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont,	476	void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont,
477	BOOL bReplaceFont )	477	BOOL bReplaceFont )
478	{	478	{
		479	#ifdef __MINGW32__
		480	XubString aFontName( reinterpret_cast< const unsigned short int * >(rLogFont.lfFaceName) );
		481	#else
479	XubString aFontName( rLogFont.lfFaceName );	482	XubString aFontName( rLogFont.lfFaceName );
		483	#endif
480	if ( aFontName.Len() )	484	if ( aFontName.Len() )
481	{	485	{
482	if ( bReplaceFont )	486	if ( bReplaceFont )
Lines 900-906 Link Here
900	{	904	{
901	wchar_t aFaceName[LF_FACESIZE+60];	905	wchar_t aFaceName[LF_FACESIZE+60];
902	if ( GetTextFaceW( maGraphicsData.mhDC, sizeof( aFaceName ) / sizeof( wchar_t ), aFaceName ) )	906	if ( GetTextFaceW( maGraphicsData.mhDC, sizeof( aFaceName ) / sizeof( wchar_t ), aFaceName ) )
		907	#ifdef __MINGW32__
		908	pMetric->maName = reinterpret_cast< const unsigned short int * >(aFaceName);
		909	#else
903	pMetric->maName = aFaceName;	910	pMetric->maName = aFaceName;
		911	#endif
904		912
905	TEXTMETRICW aWinMetric;	913	TEXTMETRICW aWinMetric;
906	if ( GetTextMetricsW( maGraphicsData.mhDC, &aWinMetric ) )	914	if ( GetTextMetricsW( maGraphicsData.mhDC, &aWinMetric ) )
Lines 1429-1435 Link Here
1429	pInfo->mbCourier = ImplSalWICompareAscii( pLogFont->elfLogFont.lfFaceName, "Courier" ) == 0;	1437	pInfo->mbCourier = ImplSalWICompareAscii( pLogFont->elfLogFont.lfFaceName, "Courier" ) == 0;
1430	else	1438	else
1431	pInfo->mbCourier = FALSE;	1439	pInfo->mbCourier = FALSE;
		1440	#ifdef __MINGW32__
		1441	XubString aName( reinterpret_cast< const unsigned short int * >(pLogFont->elfLogFont.lfFaceName) );
		1442	#else
1432	XubString aName( pLogFont->elfLogFont.lfFaceName );	1443	XubString aName( pLogFont->elfLogFont.lfFaceName );
		1444	#endif
1433	pInfo->mpName = &aName;	1445	pInfo->mpName = &aName;
1434	memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) );	1446	memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) );
1435	pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet;	1447	pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet;
Lines 1455-1461 Link Here
1455	ImplLogMetricToDevFontDataW( &(pLogFont->elfLogFont), &(pMetric->ntmTm), nFontType, pData );	1467	ImplLogMetricToDevFontDataW( &(pLogFont->elfLogFont), &(pMetric->ntmTm), nFontType, pData );
1456		1468
1457	// Test if Stylename is correct	1469	// Test if Stylename is correct
1458	const wchar_t* pStyleName = pLogFont->elfStyle;	1470	#ifdef __MINGW32__
		1471	const wchar_t* pStyleName = reinterpret_cast< const wchar_t* >(pLogFont->elfStyle);
		1472	#else
		1473	const wchar_t* pStyleName = reinterpret_cast< const unsigned short int * >(pLogFont->elfStyle);
		1474	#endif
1459	const wchar_t* pTemp = pStyleName;	1475	const wchar_t* pTemp = pStyleName;
1460	const wchar_t* pEnd = pTemp + sizeof( pLogFont->elfStyle )/sizeof( wchar_t );	1476	const wchar_t* pEnd = pTemp + sizeof( pLogFont->elfStyle )/sizeof( wchar_t );
1461	while ( *pTemp && (pTemp < pEnd) )	1477	while ( *pTemp && (pTemp < pEnd) )
Lines 1468-1474 Link Here
1468	pTemp++;	1484	pTemp++;
1469	}	1485	}
1470	if ( pStyleName && (pTemp < pEnd) )	1486	if ( pStyleName && (pTemp < pEnd) )
		1487	#ifdef __MINGW32__
		1488	pData->maStyleName = reinterpret_cast< const unsigned short int * >(pStyleName);
		1489	#else
1471	pData->maStyleName = pStyleName;	1490	pData->maStyleName = pStyleName;
		1491	#endif
1472	pData->mpSysData = (void*)(pLogFont->elfLogFont.lfCharSet);	1492	pData->mpSysData = (void*)(pLogFont->elfLogFont.lfCharSet);
1473	BOOL bAdd = TRUE;	1493	BOOL bAdd = TRUE;
1474		1494
Lines 1615-1621 Link Here
1615	char aResourceName[512];	1635	char aResourceName[512];
1616	int nMaxLen = sizeof(aResourceName)/sizeof(*aResourceName) - 16;	1636	int nMaxLen = sizeof(aResourceName)/sizeof(*aResourceName) - 16;
1617	int nLen = ::GetTempPathA( nMaxLen, aResourceName );	1637	int nLen = ::GetTempPathA( nMaxLen, aResourceName );
1618	#if (_MSC_VER < 1300)	1638	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
1619	::strncpy( aResourceName + nLen, aFileName, std::max( 0, nMaxLen - nLen ));	1639	::strncpy( aResourceName + nLen, aFileName, std::max( 0, nMaxLen - nLen ));
1620	#else	1640	#else
1621	::strncpy( aResourceName + nLen, aFileName, max( 0, nMaxLen - nLen ));	1641	::strncpy( aResourceName + nLen, aFileName, max( 0, nMaxLen - nLen ));

Lines 100-108 Link Here

(-)./vcl/win/source/gdi/salogl.cxx.orig (+6 lines)
100	// ----------	100	// ----------
101		101
102	#define INIT_OGLFNC_WGL( FncName ) static OGLFnc##FncName pImplOpenWGLFnc##FncName = NULL;	102	#define INIT_OGLFNC_WGL( FncName ) static OGLFnc##FncName pImplOpenWGLFnc##FncName = NULL;
		103	#ifdef __MINGW32__
		104	#define GET_OGLFNC_WGL( FncName ) \
		105	pImplOpenWGLFnc##FncName = (OGLFnc##FncName) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \
		106	if( !pImplOpenWGLFnc##FncName ) bRet = FALSE;
		107	#else
103	#define GET_OGLFNC_WGL( FncName ) \	108	#define GET_OGLFNC_WGL( FncName ) \
104	pImplOpenWGLFnc##FncName = (OGLFnc##FncName##) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \	109	pImplOpenWGLFnc##FncName = (OGLFnc##FncName##) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \
105	if( !pImplOpenWGLFnc##FncName ) bRet = FALSE;	110	if( !pImplOpenWGLFnc##FncName ) bRet = FALSE;
		111	#endif
106		112
107	// -----------------	113	// -----------------
108	// - Statics init. -	114	// - Statics init. -

Lines 124-130 Link Here

(-)./vcl/win/source/app/salshl.cxx.orig (-1 / +1 lines)
124	if ( nReason == DLL_PROCESS_ATTACH )	124	if ( nReason == DLL_PROCESS_ATTACH )
125	aSalShlData.mhInst = hInst;	125	aSalShlData.mhInst = hInst;
126		126
127	#if !defined ( __BORLANDC__ )	127	#if !defined ( __BORLANDC__ ) && !defined ( __MINGW32__ )
128	#ifdef ICC	128	#ifdef ICC
129	if ( _CRT_init() == -1 )	129	if ( _CRT_init() == -1 )
130	#else	130	#else




                        nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));

                        Point       aTempPos = LogicToPixel( aPos );
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
                        nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min( lc_x1, lc_x2 ) );
#else
                        nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min( lc_x1, lc_x2 ) );

            nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));

            Point aTempPos = LogicToPixel( aPos );
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
            nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min(lc_x1, lc_x2) );
#else
            nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min(lc_x1, lc_x2) );

            long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];
            nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));

#if (_MSC_VER < 1300) && !defined(__MINGW32__)
            Point aTempPos( std::min(lc_x1,lc_x2), GetFontMetric().GetAscent() );
            if( bInvalidPos )  // #106952#, place behind the (last) character
                aTempPos = Point( std::max(lc_x1,lc_x2), GetFontMetric().GetAscent() );

    long nXOffset = 0;
    if( nBase != nIndex )
    {
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
        xub_StrLen nStart = std::min( nBase, nIndex );
        xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart;
#else

    long nXOffset = 0;
    if( nBase != nIndex )
    {
#if (_MSC_VER < 1300) && !defined(__MINGW32__)
        xub_StrLen nStart = std::min( nBase, nIndex );
        xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart;
#else

Lines 14-19 Link Here

(-)./vcl/prj/d.lst.orig (+1 lines)
14	..\%__SRC%\bin\getstyle-gnome %_DEST%\bin%_EXT%\getstyle-gnome	14	..\%__SRC%\bin\getstyle-gnome %_DEST%\bin%_EXT%\getstyle-gnome
15	..\%__SRC%\bin\msgbox-gnome %_DEST%\bin%_EXT%\msgbox-gnome	15	..\%__SRC%\bin\msgbox-gnome %_DEST%\bin%_EXT%\msgbox-gnome
16	..\%__SRC%\lib\libvcl.so %_DEST%\lib%_EXT%\libvcl.so	16	..\%__SRC%\lib\libvcl.so %_DEST%\lib%_EXT%\libvcl.so
		17	..\%__SRC%\lib\libvcl.a %_DEST%\lib%_EXT%\libvcl.a
17	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	18	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
18	..\%__SRC%\lib\app16.lib %_DEST%\lib%_EXT%\app16.lib	19	..\%__SRC%\lib\app16.lib %_DEST%\lib%_EXT%\app16.lib
19	..\%__SRC%\lib\gdi16.lib %_DEST%\lib%_EXT%\gdi16.lib	20	..\%__SRC%\lib\gdi16.lib %_DEST%\lib%_EXT%\gdi16.lib




..\%__SRC%\bin\spl*.dll %_DEST%\bin%_EXT%\spl*.dll
..\%__SRC%\bin\socomp.dll %_DEST%\bin%_EXT%\socomp.dll
..\%__SRC%\lib\libwrp*.so %_DEST%\lib%_EXT%\libwrp*.so
..\%__SRC%\lib\libwrp*.a %_DEST%\lib%_EXT%\libwrp*.a
..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib%_EXT%\libwrp*.dylib
..\%__SRC%\lib\libspl*.so %_DEST%\lib%_EXT%\libspl*.so
..\%__SRC%\lib\libspl*.a %_DEST%\lib%_EXT%\libspl*.a
..\%__SRC%\lib\libspl*.dylib %_DEST%\lib%_EXT%\libspl*.dylib
..\%__SRC%\lib\libsocomp.so %_DEST%\lib%_EXT%\libsocomp.so
..\%__SRC%\lib\libsocomp.a %_DEST%\lib%_EXT%\libsocomp.a
..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib%_EXT%\libsocomp.dylib
..\%__SRC%\bin\offacc*.dll %_DEST%\bin%_EXT%\offacc*.dll
..\%__SRC%\lib\liboffacc*.so %_DEST%\lib%_EXT%\liboffacc*.so
..\%__SRC%\lib\liboffacc*.a %_DEST%\lib%_EXT%\liboffacc*.a
..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib%_EXT%\liboffacc*.dylib

..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin

..\%__SRC%\bin\pkgchk %_DEST%\bin%_EXT%\pkgchk.bin
..\%__SRC%\bin\pkgchk*.dll %_DEST%\bin%_EXT%\pkgchk*.dll
..\%__SRC%\lib\libpkgchk*.so %_DEST%\lib%_EXT%\libpkgchk*.so
..\%__SRC%\lib\libpkgchk*.a %_DEST%\lib%_EXT%\libpkgchk*.a
..\%__SRC%\lib\libpkgchk*.dylib %_DEST%\lib%_EXT%\libpkgchk*.dylib

..\%__SRC%\bin\pagein %_DEST%\bin%_EXT%\pagein

Lines 141-147 Link Here

(-)./idl/source/prj/svidl.cxx.orig (-1 / +1 lines)
141	\|*	141	\|*
142	\|* Beschreibung	142	\|* Beschreibung
143	*************************************************************************/	143	*************************************************************************/
144	#if defined( UNX ) \|\| (defined( PM2 ) && defined( CSET )) \|\| defined (WTC) \|\| defined (MAC) \|\| defined (MTW)	144	#if defined( UNX ) \|\| (defined( PM2 ) && defined( CSET )) \|\| defined (WTC) \|\| defined (MAC) \|\| defined (MTW) \|\| defined (__MINGW32__)
145	int main ( int argc, char ** argv)	145	int main ( int argc, char ** argv)
146	{	146	{
147	#else	147	#else

Lines 6-11 Link Here

(-)./offmgr/prj/d.lst.orig (+1 lines)
6	touch: ..\%__SRC%\misc\ofa.hid %_DEST%\bin%_EXT%\ofa.hid	6	touch: ..\%__SRC%\misc\ofa.hid %_DEST%\bin%_EXT%\ofa.hid
7	..\%__SRC%\lib\_ofa.lib %_DEST%\lib%_EXT%\aofa.lib	7	..\%__SRC%\lib\_ofa.lib %_DEST%\lib%_EXT%\aofa.lib
8	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	8	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		9	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
9	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	10	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
10	..\%__SRC%\slb\ofa.lib %_DEST%\lib%_EXT%\xofa.lib	11	..\%__SRC%\slb\ofa.lib %_DEST%\lib%_EXT%\xofa.lib
11	..\%__SRC%\inc\class.lst %_DEST%\inc%_EXT%\class.lst	12	..\%__SRC%\inc\class.lst %_DEST%\inc%_EXT%\class.lst

Lines 1-5 Link Here

(-)./connectivity/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	2	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		3	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
3	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib	4	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
4	..\%__SRC%\slb\connectivity. %_DEST%\lib%_EXT%\connectivity.	5	..\%__SRC%\slb\connectivity. %_DEST%\lib%_EXT%\connectivity.
5	..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*	6	..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*

Lines 1-5 Link Here

(-)./dbaccess/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%	2	..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
		3	..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
3	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%	4	..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
4	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl	5	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
5	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	6	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin

Lines 2-7 Link Here

(-)./i18n/prj/d.lst.orig (+1 lines)
2		2
3	..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll	3	..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll
4	..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so	4	..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so
		5	..\%__SRC%\lib\libi18n?????.a %_DEST%\lib%_EXT%\libi18n?????.a
5	..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib	6	..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib
6		7
7	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib	8	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib




# #################################################################
# OpenOffice.org 645 build environment file for: WINNT. 
# Generated on: Sat Jan 17 23:30:09     2004 
# Source this file to set up the build environment. 
# 1. exec (t)csh 
# 2. source winmingw.set 

setenv SRC_ROOT "/cygdrive/d/work/ooo_1.1rc4_src"
setenv SHELL "/usr/bin/tcsh"
setenv JAVA_HOME "/cygdrive/h/j2sdk1.4.1_03"
setenv ANT_HOME "/cygdrive/h/apache-ant-1.5.4/"
setenv JDKLIB "/cygdrive/h/j2sdk1.4.1_03/lib"
setenv STLPORT4 "NO_STLPORT4"
setenv ASM_PATH "NO_ASM_HOME"

# 
setenv SOLAR_JAVA "TRUE"
setenv COM "GCC"
setenv COMPATH "h:/mingw"
setenv CPU "I"
setenv CPUNAME "INTEL"
setenv CVER "C300"

setenv SET_EXCEPTIONS "TRUE"
setenv emergency "FALSE"
setenv use_shl_versions "TRUE"
setenv WRAPCMD "gum.pl"

# 
# Variable values. 

setenv SOLARROOT "$SRC_ROOT"
setenv RSCRES "$SRC_ROOT"
setenv SOLARVER "/cygdrive/d/work/ooo_1.1rc4_src/solver"
setenv SOLARVERSION "d:/work/ooo_1.1rc4_src/solver/645"
setenv SOLARENV "/cygdrive/d/work/ooo_1.1rc4_src/solenv"
setenv SOLARENVINC "$SOLARENV/inc"
setenv LOCALINI "$SOLARENV/config"

setenv DMAKEROOT "$SOLARENVINC/startup"
setenv CLASSPATH "$JAVA_HOME/jre/lib/rt.jar:."
setenv XCLASSPATH "$JAVA_HOME/jre/lib/rt.jar:."
setenv SOLARINCLUDES "-I/cygdrive/d/work/ooo_1.1rc4_src/solver/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/wntgcci.pro/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/inc -I$COMPATH/include -I/cygdrive/h/mingw/lib/gcc-lib/mingw32/3.3.1/include -I/cygdrive/h/mingw/include/c++/3.3.1 -I/cygdrive/h/mingw/include/c++/3.3.1/mingw32 -I'/cygdrive/H/SDK/include'"
setenv PATH ".:$SOLARVER/$UPD/$INPATH/bin:$SOLARENV/bin:$SOLARENV/$OUTPATH/bin:/cygdrive/h/j2sdk1.4.1_03/bin:/cygdrive/h/j2sdk1.4.1_03/jre/bin/client:/cygdrive/h/mingw/bin:/usr/local/bin:/usr/bin:/bin:/cygdrive/h/Perl/bin/:/cygdrive/h/WINDOWS/system32:/cygdrive/h/WINDOWS:/cygdrive/h/WINDOWS/System32/Wbem:/cygdrive/h/Program Files/ATI Technologies/ATI Control Panel:/cygdrive/h/Program Files/Real/Helix Producer Basic:/cygdrive/h/SDK/Bin/.:/cygdrive/h/SDK/Bin/WinNT/.:/cygdrive/h/SDK/Bin/.:/cygdrive/h/SDK/Bin/WinNT/.:/cygdrive/h/usr:/cygdrive/c"
setenv SOLARLIB "-L$SOLARVER/$UPD/$INPATH/lib -L../lib -L$SOLARENV/$OUTPATH/lib"
setenv SOLARINC "-I. -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/stl -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/external -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc -Id:/work/ooo_1.1rc4_src/solenv/wntgcci/inc -Id:/work/ooo_1.1rc4_src/solenv/inc -Id:/work/ooo_1.1rc4_src/res -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/stl -Ih:/j2sdk1.4.1_03/include/win32 -Ih:/j2sdk1.4.1_03/include -Ih:/mingw/include -Ih:/mingw/lib/gcc-lib/mingw32/3.3.1/include -Ih:/mingw/include/c++/3.3.1 -Ih:/mingw/include/c++/3.3.1/mingw32 -Ih:/SDK/include"
setenv COMP_ENV "wntgcci"
setenv JAVAHOME "$JAVA_HOME"
setenv CC "gcc -mno-cygwin"

setenv WITH_LIBSN "NO"
setenv LIBSN_CFLAGS ""
setenv LIBSN_LIBS ""
setenv GXX_INCLUDE_PATH "h:/mingw/include/c++/3.3.1"
setenv COMMON_BUILD_TOOLS "$SRC_ROOT/external/common"
setenv SOLARSRC "d:\\work\\ooo_1.1rc4_src" 
setenv LIB ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\lib;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\lib;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\lib;h:\\j2sdk1.4.1_03\\lib;h:\\mingw\\lib" 
setenv IENV ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\mingw\\include;h:\\mingw\\lib\\gcc-lib\\mingw32\\3.3.1\\include;h:\\mingw\\include\\c++\\3.3.1;h:\\mingw\\include\\c++\\3.3.1\\mingw32;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32" 
setenv ILIB ".;.;d:/work/ooo_1.1rc4_src/solver/645/lib;d:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/lib;d:/work/ooo_1.1rc4_src/solenv/wntgcci/lib;h:/j2sdk1.4.1_03/lib;h:/mingw/lib"
setenv INCLUDE ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\mingw\\include;h:\\mingw\\lib\\gcc-lib\\mingw32\\3.3.1\\include;h:\\mingw\\include\\c++\\3.3.1;h:\\mingw\\include\\c++\\3.3.1\\mingw32;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32" 
setenv GREP "$CYGWIN/grep.exe"
setenv FIND "$CYGWIN/find.exe"
setenv LS "$CYGWIN/ls.exe"

Return to issue 24588

Lines 4-9 Link Here

(-)./regexp/prj/d.lst.orig (+1 lines)
4		4
5	..\%__SRC%\bin\i18nregexp.dll %_DEST%\bin%_EXT%\i18nregexp.dll	5	..\%__SRC%\bin\i18nregexp.dll %_DEST%\bin%_EXT%\i18nregexp.dll
6	..\%__SRC%\lib\libi18nregexp.so %_DEST%\lib%_EXT%\libi18nregexp.so	6	..\%__SRC%\lib\libi18nregexp.so %_DEST%\lib%_EXT%\libi18nregexp.so
		7	..\%__SRC%\lib\libi18nregexp.a %_DEST%\lib%_EXT%\libi18nregexp.a
7	..\%__SRC%\lib\libi18nregexp.dylib %_DEST%\lib%_EXT%\libi18nregexp.dylib	8	..\%__SRC%\lib\libi18nregexp.dylib %_DEST%\lib%_EXT%\libi18nregexp.dylib
8	..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib%_EXT%\ii18nregexp.lib	9	..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib%_EXT%\ii18nregexp.lib
9		10

Lines 5-8 Link Here

(-)./jvmaccess/prj/d.lst.orig (+1 lines)
5	..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib	5	..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib
6	..\%__SRC%\lib\libjvmaccess.so... %_DEST%\lib%_EXT%\*	6	..\%__SRC%\lib\libjvmaccess.so... %_DEST%\lib%_EXT%\*
7	..\%__SRC%\lib\libjvmaccess.dylib %_DEST%\lib%_EXT%\*	7	..\%__SRC%\lib\libjvmaccess.dylib %_DEST%\lib%_EXT%\*
		8	..\%__SRC%\lib\libjvmaccess.a %_DEST%\lib%_EXT%\
8	linklib: libjvmaccess.so...	9	linklib: libjvmaccess.so...

Lines 1-2 Link Here

(-)./testtools/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\	1	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\
2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\	2	..\%__SRC%\lib\.so %_DEST%\lib%_EXT%\
		3	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\

Lines 1-4 Link Here

(-)./padmin/prj/d.lst.orig (+1 lines)
1	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res	1	..\%__SRC%\bin\.res %_DEST%\bin%_EXT%\.res
2	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin	2	..\%__SRC%\bin\.bin %_DEST%\bin%_EXT%\.bin
3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so	3	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%\lib.so
		4	..\%__SRC%\lib\lib.a %_DEST%\lib%_EXT%\lib.a
4	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib	5	..\%__SRC%\lib\lib.dylib %_DEST%\lib%_EXT%\lib.dylib

Lines 103-109 Link Here

(-)./embedserv/source/inc/docholder.hxx.orig (-3 / +10 lines)
103		103
104	::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > DocumentFrame();	104	::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > DocumentFrame();
105		105
		106	#ifdef __MINGW32__
		107	XWindowsComPtr< IDispatch > m_pIDispatch;
		108	#else
106	CComPtr< IDispatch > m_pIDispatch;	109	CComPtr< IDispatch > m_pIDispatch;
		110	#endif
107		111
108	public:	112	public:
109		113
Lines 139-157 Link Here
139	::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetDocument() { return m_xDocument; }	143	::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetDocument() { return m_xDocument; }
140		144
141	// XEventListener	145	// XEventListener
142	virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aSource );	146	virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aSource )
		147	throw( ::com::sun::star::uno::RuntimeException );
143		148
144	// XCloseListener	149	// XCloseListener
145	virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aSource, sal_Bool bGetsOwnership )	150	virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aSource, sal_Bool bGetsOwnership )
146	throw( ::com::sun::star::util::CloseVetoException );	151	throw( ::com::sun::star::util::CloseVetoException );
147		152
148	virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aSource );	153	virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aSource )
		154	throw( ::com::sun::star::uno::RuntimeException );
149		155
150	// XTerminateListener	156	// XTerminateListener
151	virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& aSource )	157	virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& aSource )
152	throw( ::com::sun::star::frame::TerminationVetoException );	158	throw( ::com::sun::star::frame::TerminationVetoException );
153		159
154	virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& aSource );	160	virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& aSource )
		161	throw( ::com::sun::star::uno::RuntimeException );
155		162
156	// XModifyListener	163	// XModifyListener
157	virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);	164	virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);

Lines 92-105 Link Here

(-)./embedserv/source/inc/servprov.hxx.orig (-6 / +10 lines)
92	class EmbedServer_Impl : public ::cppu::OWeakObject, ::com::sun::star::lang::XTypeProvider	92	class EmbedServer_Impl : public ::cppu::OWeakObject, ::com::sun::star::lang::XTypeProvider
93	{	93	{
94	public:	94	public:
95	EmbedServer_Impl( const ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> &xFactory );	95	EmbedServer_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &xFactory );
96	~EmbedServer_Impl();	96	~EmbedServer_Impl();
97		97
98	// XInterface	98	// XInterface
99	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )	99	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
100	throw(::com::sun::star::uno::RuntimeException);	100	throw(::com::sun::star::uno::RuntimeException);
101	virtual void SAL_CALL acquire() throw (::com::sun::star::uno::RuntimeException);	101	virtual void SAL_CALL acquire() throw ();
102	virtual void SAL_CALL release() throw (::com::sun::star::uno::RuntimeException);	102	virtual void SAL_CALL release() throw ();
103		103
104	// XTypeProvider	104	// XTypeProvider
105	virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )	105	virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )
Lines 109-123 Link Here
109		109
110	protected:	110	protected:
111		111
		112	#ifdef __MINGW32__
		113	XWindowsComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ];
		114	#else
112	CComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ];	115	CComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ];
113	::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xFactory;	116	#endif
		117	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
114	};	118	};
115		119
116	class EmbedProviderFactory_Impl : public IClassFactory	120	class EmbedProviderFactory_Impl : public IClassFactory
117	{	121	{
118	public:	122	public:
119		123
120	EmbedProviderFactory_Impl( const ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory>& xFactory, const GUID* pGuid);	124	EmbedProviderFactory_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const GUID* pGuid);
121	~EmbedProviderFactory_Impl();	125	~EmbedProviderFactory_Impl();
122		126
123	sal_Bool registerClass();	127	sal_Bool registerClass();
Lines 138-144 Link Here
138	GUID m_guid;	142	GUID m_guid;
139	DWORD m_factoryHandle;	143	DWORD m_factoryHandle;
140		144
141	::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xFactory;	145	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
142	};	146	};
143		147
144	#endif	148	#endif

Lines 130-138 Link Here

(-)./embedserv/source/embed/docholder.cxx.orig (-3 / +6 lines)
130	// add mutex locking ???	130	// add mutex locking ???
131		131
132	DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory >& xFactory,EmbedDocument_Impl *pOLEInterface)	132	DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory >& xFactory,EmbedDocument_Impl *pOLEInterface)
133	: m_xFactory( xFactory ),	133	: m_pOLEInterface(pOLEInterface),
134	m_pOLEInterface(pOLEInterface),	134	m_pInterceptor(0),
135	m_pInterceptor(0)	135	m_xFactory( xFactory )
136	{	136	{
137	const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) );	137	const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) );
138	uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY );	138	uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY );
Lines 599-604 Link Here
599	}	599	}
600		600
601	void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource )	601	void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource )
		602	throw( uno::RuntimeException )
602	{	603	{
603	if ( m_xDocument.is() && m_xDocument == aSource.Source )	604	if ( m_xDocument.is() && m_xDocument == aSource.Source )
604	{	605	{
Lines 620-625 Link Here
620	}	621	}
621		622
622	void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )	623	void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
		624	throw( uno::RuntimeException )
623	{	625	{
624	uno::Reference< util::XCloseBroadcaster > xEventBroadcaster(	626	uno::Reference< util::XCloseBroadcaster > xEventBroadcaster(
625	aSource.Source, uno::UNO_QUERY );	627	aSource.Source, uno::UNO_QUERY );
Lines 644-649 Link Here
644	}	646	}
645		647
646	void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource )	648	void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource )
		649	throw( uno::RuntimeException )
647	{	650	{
648	OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." );	651	OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." );
649		652

Lines 77-83 Link Here

(-)./embedserv/source/embed/intercept.cxx.orig (-3 / +4 lines)
77		77
78		78
79		79
80	uno::Sequence<::rtl::OUString> Interceptor::m_aInterceptedURL(IUL);	80	uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL);
81		81
82		82
83		83
Lines 144-149 Link Here
144		144
145		145
146	void SAL_CALL Interceptor::dispose()	146	void SAL_CALL Interceptor::dispose()
		147	throw(::com::sun::star::uno::RuntimeException)
147	{	148	{
148	lang::EventObject aEvt;	149	lang::EventObject aEvt;
149	aEvt.Source = static_cast< frame::XDispatch* >( this );	150	aEvt.Source = static_cast< frame::XDispatch* >( this );
Lines 167-174 Link Here
167	DocumentHolder* pDocH)	168	DocumentHolder* pDocH)
168	: m_pOLEInterface(pOLEInterface),	169	: m_pOLEInterface(pOLEInterface),
169	m_pDocH(pDocH),	170	m_pDocH(pDocH),
170	m_pStatCL(0),	171	m_pDisposeEventListeners(0),
171	m_pDisposeEventListeners(0)	172	m_pStatCL(0)
172	{	173	{
173	m_aInterceptedURL[0] = rtl::OUString(	174	m_aInterceptedURL[0] = rtl::OUString(
174	RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));	175	RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));

Lines 66-77 Link Here

(-)./embedserv/source/embed/esdll.cxx.orig (+8 lines)
66	#undef _DEBUG	66	#undef _DEBUG
67	#endif	67	#endif
68		68
		69	#ifdef __MINGW32__
		70	#include <windows.h>
		71	#else
69	#include <atlbase.h>	72	#include <atlbase.h>
70	CComModule _Module;	73	CComModule _Module;
71	#include <atlcom.h>	74	#include <atlcom.h>
72		75
73	BEGIN_OBJECT_MAP(ObjectMap)	76	BEGIN_OBJECT_MAP(ObjectMap)
74	END_OBJECT_MAP()	77	END_OBJECT_MAP()
		78	#endif
75		79
76	/////////////////////////////////////////////////////////////////////////////	80	/////////////////////////////////////////////////////////////////////////////
77	// DLL Entry Point	81	// DLL Entry Point
Lines 81-92 Link Here
81	{	85	{
82	if (dwReason == DLL_PROCESS_ATTACH)	86	if (dwReason == DLL_PROCESS_ATTACH)
83	{	87	{
		88	#ifndef __MINGW32__
84	_Module.Init(ObjectMap, hInstance, NULL);	89	_Module.Init(ObjectMap, hInstance, NULL);
		90	#endif
85	DisableThreadLibraryCalls(hInstance);	91	DisableThreadLibraryCalls(hInstance);
86	}	92	}
87	else if (dwReason == DLL_PROCESS_DETACH)	93	else if (dwReason == DLL_PROCESS_DETACH)
88	{	94	{
		95	#ifndef __MINGW32__
89	_Module.Term();	96	_Module.Term();
		97	#endif
90	}	98	}
91	return TRUE; // ok	99	return TRUE; // ok
92	}	100	}

Lines 199-205 Link Here

(-)./accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx.orig (-6 / +6 lines)
199	if ( pJava_environment && pUno_environment )	199	if ( pJava_environment && pUno_environment )
200	{	200	{
201	g_unoMapping = Mapping(pUno_environment, pJava_environment);	201	g_unoMapping = Mapping(pUno_environment, pJava_environment);
202	getCppuType((Reference< XAccessible > ) 0).getDescription((typelib_TypeDescription *) & g_pTypeDescription);	202	getCppuType((::com::sun::star::uno::Reference< XAccessible > ) 0).getDescription((typelib_TypeDescription *) & g_pTypeDescription);
203	}	203	}
204		204
205	if ( pJava_environment )	205	if ( pJava_environment )
Lines 268-274 Link Here
268	{	268	{
269	if ( pWindow && pWindow->IsTopWindow() )	269	if ( pWindow && pWindow->IsTopWindow() )
270	{	270	{
271	Reference< XAccessible > xAccessible;	271	::com::sun::star::uno::Reference< XAccessible > xAccessible;
272		272
273	// Test for combo box - drop down floating windows first	273	// Test for combo box - drop down floating windows first
274	Window * pParentWindow = pWindow->GetParent();	274	Window * pParentWindow = pWindow->GetParent();
Lines 278-287 Link Here
278	try	278	try
279	{	279	{
280	// The parent window of a combo box floating window should have the role COMBO_BOX	280	// The parent window of a combo box floating window should have the role COMBO_BOX
281	Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible());	281	::com::sun::star::uno::Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible());
282	if ( xParentAccessible.is() )	282	if ( xParentAccessible.is() )
283	{	283	{
284	Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext());	284	::com::sun::star::uno::Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext());
285	if ( xParentAC.is() && (AccessibleRole::COMBO_BOX == xParentAC->getAccessibleRole()) )	285	if ( xParentAC.is() && (AccessibleRole::COMBO_BOX == xParentAC->getAccessibleRole()) )
286	{	286	{
287	// O.k. - this is a combo box floating window corresponding to the child of role LIST of the parent.	287	// O.k. - this is a combo box floating window corresponding to the child of role LIST of the parent.
Lines 289-298 Link Here
289	sal_Int32 nCount = xParentAC->getAccessibleChildCount();	289	sal_Int32 nCount = xParentAC->getAccessibleChildCount();
290	for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++)	290	for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++)
291	{	291	{
292	Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n);	292	::com::sun::star::uno::Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n);
293	if ( xChild.is() )	293	if ( xChild.is() )
294	{	294	{
295	Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext();	295	::com::sun::star::uno::Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext();
296	if ( xChildAC.is() && (AccessibleRole::LIST == xChildAC->getAccessibleRole()) )	296	if ( xChildAC.is() && (AccessibleRole::LIST == xChildAC->getAccessibleRole()) )
297	{	297	{
298	xAccessible = xChild;	298	xAccessible = xChild;

Lines 238-244 Link Here

(-)./i18npool/source/indexentry/indexentrysupplier.cxx.orig (-6 / +6 lines)
238	if (address != 0xFFFF)	238	if (address != 0xFFFF)
239	address = PhoneticCharacter_ko[address + (ch & 0xFF)];	239	address = PhoneticCharacter_ko[address + (ch & 0xFF)];
240	if (address != 0xFFFF)	240	if (address != 0xFFFF)
241	candidate += OUString(address);	241	candidate += OUString::valueOf(sal_Unicode(address));
242	else	242	else
243	candidate += space;	243	candidate += space;
244	}	244	}
Lines 269-281 Link Here
269	getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm );	269	getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm );
270	}	270	}
271		271
272	#if (_MSC_VER < 1300)	272	//#if (_MSC_VER < 1300)
273	sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2) {	273	static inline sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2) {
274	return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;	274	return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;
275	}	275	}
276	#else	276	//#else
277	extern sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2);	277	//extern sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2);
278	#endif	278	//#endif
279		279
280	sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException )	280	sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException )
281	{	281	{

Lines 5-24 Link Here

(-)./i18npool/prj/d.lst.orig (+4 lines)
5		5
6	..\%__SRC%\bin\i18npool.dll %_DEST%\bin%_EXT%\i18npool.dll	6	..\%__SRC%\bin\i18npool.dll %_DEST%\bin%_EXT%\i18npool.dll
7	..\%__SRC%\lib\libi18npool.so %_DEST%\lib%_EXT%\libi18npool.so	7	..\%__SRC%\lib\libi18npool.so %_DEST%\lib%_EXT%\libi18npool.so
		8	..\%__SRC%\lib\libi18npool.a %_DEST%\lib%_EXT%\libi18npool.a
8	..\%__SRC%\lib\libi18npool.dylib %_DEST%\lib%_EXT%\libi18npool.dylib	9	..\%__SRC%\lib\libi18npool.dylib %_DEST%\lib%_EXT%\libi18npool.dylib
9	..\%__SRC%\lib\ii18npool.lib %_DEST%\lib%_EXT%\ii18npool.lib	10	..\%__SRC%\lib\ii18npool.lib %_DEST%\lib%_EXT%\ii18npool.lib
10		11
11	..\%__SRC%\bin\i18nsearch.dll %_DEST%\bin%_EXT%\i18nsearch.dll	12	..\%__SRC%\bin\i18nsearch.dll %_DEST%\bin%_EXT%\i18nsearch.dll
12	..\%__SRC%\lib\libi18nsearch.so %_DEST%\lib%_EXT%\libi18nsearch.so	13	..\%__SRC%\lib\libi18nsearch.so %_DEST%\lib%_EXT%\libi18nsearch.so
		14	..\%__SRC%\lib\libi18nsearch.a %_DEST%\lib%_EXT%\libi18nsearch.a
13	..\%__SRC%\lib\libi18nsearch.dylib %_DEST%\lib%_EXT%\libi18nsearch.dylib	15	..\%__SRC%\lib\libi18nsearch.dylib %_DEST%\lib%_EXT%\libi18nsearch.dylib
14	..\%__SRC%\lib\ii18nsearch.lib %_DEST%\lib%_EXT%\ii18nsearch.lib	16	..\%__SRC%\lib\ii18nsearch.lib %_DEST%\lib%_EXT%\ii18nsearch.lib
15		17
16	..\%__SRC%\bin\localedata_.dll %_DEST%\bin%_EXT%\localedata_.dll	18	..\%__SRC%\bin\localedata_.dll %_DEST%\bin%_EXT%\localedata_.dll
17	..\%__SRC%\lib\liblocaledata_.so %_DEST%\lib%_EXT%\liblocaledata_.so	19	..\%__SRC%\lib\liblocaledata_.so %_DEST%\lib%_EXT%\liblocaledata_.so
		20	..\%__SRC%\lib\liblocaledata_.a %_DEST%\lib%_EXT%\liblocaledata_.a
18	..\%__SRC%\lib\liblocaledata_.dylib %_DEST%\lib%_EXT%\liblocaledata_.dylib	21	..\%__SRC%\lib\liblocaledata_.dylib %_DEST%\lib%_EXT%\liblocaledata_.dylib
19		22
20	..\%__SRC%\bin\dict_.dll %_DEST%\bin%_EXT%\dict_.dll	23	..\%__SRC%\bin\dict_.dll %_DEST%\bin%_EXT%\dict_.dll
21	..\%__SRC%\lib\libdict_.so %_DEST%\lib%_EXT%\libdict_.so	24	..\%__SRC%\lib\libdict_.so %_DEST%\lib%_EXT%\libdict_.so
		25	..\%__SRC%\lib\libdict_.a %_DEST%\lib%_EXT%\libdict_.a
22	..\%__SRC%\lib\libdict_.dylib %_DEST%\lib%_EXT%\libdict_.dylib	26	..\%__SRC%\lib\libdict_.dylib %_DEST%\lib%_EXT%\libdict_.dylib
23		27
24	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib	28	..\%__SRC%\lib\libstatic.dylib %_DEST%\lib%_EXT%\libstatic.dylib

Lines 74-80 Link Here

(-)./fpicker/source/win32/folderpicker/MtaFop.cxx.orig (+114 lines)
74	#include "MtaFop.hxx"	74	#include "MtaFop.hxx"
75	#include <wchar.h>	75	#include <wchar.h>
76	#include <process.h>	76	#include <process.h>
		77	#ifdef __MINGW32__
		78	template<class T>
		79	class XWindowsComPtr
		80	{
		81	public:
		82	XWindowsComPtr()
		83	{
		84	p=NULL;
		85	}
		86	~XWindowsComPtr()
		87	{
		88	if (p)
		89	p->Release();
		90	}
		91	XWindowsComPtr(const XWindowsComPtr<T>& lp)
		92	{
		93	if ((p = lp.p) != NULL)
		94	p->AddRef();
		95	}
		96	XWindowsComPtr(T* lp)
		97	{
		98	if ((p = lp) != NULL)
		99	p->AddRef();
		100	}
		101	T* operator=(const XWindowsComPtr<T>& lp)
		102	{
		103	return assign(lp.p);
		104	}
		105	T* operator=(T* lp)
		106	{
		107	return assign(lp);
		108	}
		109	bool operator!() const
		110	{
		111	return (p == NULL);
		112	}
		113	operator T*() const
		114	{
		115	return p;
		116	}
		117	T* operator->() const
		118	{
		119	return p;
		120	}
		121	T** operator&()
		122	{
		123	return &p;
		124	}
		125	private:
		126	T* assign(T* lp)
		127	{
		128	if (lp != NULL)
		129	lp->AddRef();
		130	if (p)
		131	p->Release();
		132	return p = lp;
		133	}
		134	bool operator==(T* pT) const
		135	{
		136	return p == pT;
		137	}
		138	T* p;
		139	};
		140	typedef XWindowsComPtr< IMalloc > IMallocPtr;
141	typedef XWindowsComPtr< IShellFolder > IShellFolderPtr;
142	class _com_error {
143	public:
144	// Constructors
145	//
146	_com_error(HRESULT hr,
147	IErrorInfo* perrinfo = NULL,
148	bool fAddRef = false) throw();
149	_com_error(const _com_error& that) throw();
150
151	// Destructor
152	//
153	virtual ~_com_error() throw();
154
155	// Assignment operator
156	//
157	_com_error& operator=(const _com_error& that) throw();
158
159	// Accessors
160	//
161	HRESULT Error() const throw() { return m_hresult; }
162	WORD WCode() const throw();
163	IErrorInfo * ErrorInfo() const throw();
164
165	// IErrorInfo method accessors
166	//
167	// _bstr_t Description() const throw(_com_error);
168	DWORD HelpContext() const throw();
169	// _bstr_t HelpFile() const throw(_com_error);
170	// _bstr_t Source() const throw(_com_error);
171	// GUID GUID() const throw();
172
173	// FormatMessage accessors
174	const TCHAR * ErrorMessage() const throw();
175
176	// EXCEPINFO.wCode <-> HRESULT mappers
177	static HRESULT WCodeToHRESULT(WORD wCode) throw();
178	static WORD HRESULTToWCode(HRESULT hr) throw();
179
180	private:
181	enum {
182	WCODE_HRESULT_FIRST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x200),
183	WCODE_HRESULT_LAST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF+1, 0) - 1
184	};
185	const HRESULT m_hresult;
186	IErrorInfo * m_perrinfo;
187	mutable TCHAR * m_pszMsg;
188	};
189	#else
77	#include <comdef.h>	190	#include <comdef.h>
		191	#endif
78		192
79	#ifndef _RESOURCEPROVIDER_HXX_	193	#ifndef _RESOURCEPROVIDER_HXX_
80	#include "..\misc\resourceprovider.hxx"	194	#include "..\misc\resourceprovider.hxx"

Lines 125-132 Link Here

(-)./soltools/ldump/hashtbl.cxx.orig (-13 / +13 lines)
125	HashTable::~HashTable()	125	HashTable::~HashTable()
126	{	126	{
127	// Wenn die HashTable der Owner der Objecte ist,	127	// Wenn die HashTable der Owner der Objecte ist,
128	// müssen die Destruktoren separat gerufen werden.	128	// msen die Destruktoren separat gerufen werden.
129	// Dies geschieht über die virtuelle Methode OnDeleteObject()	129	// Dies geschieht er die virtuelle Methode OnDeleteObject()
130	//	130	//
131	// Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!!	131	// Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!!
132	// Der Code muß deshalb ins Macro	132	// Der Code muß deshalb ins Macro
Lines 144-155 Link Here
144	}	144	}
145	*/	145	*/
146		146
147	// Speicher für HashItems freigeben	147	// Speicher f HashItems freigeben
148	delete [] m_pData;	148	delete [] m_pData;
149	}	149	}
150		150
151	void* HashTable::GetObjectAt(unsigned long lPos) const	151	void* HashTable::GetObjectAt(unsigned long lPos) const
152	// Gibt Objekt zurück, wenn es eines gibt, sonst NULL;	152	// Gibt Objekt zurk, wenn es eines gibt, sonst NULL;
153	{	153	{
154	HashItem *pItem = &m_pData[lPos];	154	HashItem *pItem = &m_pData[lPos];
155		155
Lines 198-204 Link Here
198	}	198	}
199		199
200	unsigned long HashTable::Probe(unsigned long lPos) const	200	unsigned long HashTable::Probe(unsigned long lPos) const
201	// gibt den Folgewert von lPos zurück	201	// gibt den Folgewert von lPos zurk
202	{	202	{
203	lPos++; if (lPos==m_lSize) lPos=0;	203	lPos++; if (lPos==m_lSize) lPos=0;
204	return lPos;	204	return lPos;
Lines 212-218 Link Here
212	bool HashTable::Insert(const char * Key, void* pObject)	212	bool HashTable::Insert(const char * Key, void* pObject)
213	// pre: Key ist nicht im Dictionary enthalten, sonst return FALSE	213	// pre: Key ist nicht im Dictionary enthalten, sonst return FALSE
214	// Dictionary ist nicht voll, sonst return FALSE	214	// Dictionary ist nicht voll, sonst return FALSE
215	// post: pObject ist unter Key im Dictionary; m_nElem wurde erhöht	215	// post: pObject ist unter Key im Dictionary; m_nElem wurde erht
216	{	216	{
217	SmartGrow();	217	SmartGrow();
218		218
Lines 266-272 Link Here
266		266
267	HashItem* HashTable::FindPos(const char * Key) const	267	HashItem* HashTable::FindPos(const char * Key) const
268	// sucht den Key; gibt Refrenz auf den Eintrag (gefunden)	268	// sucht den Key; gibt Refrenz auf den Eintrag (gefunden)
269	// oder NULL (nicht gefunden) zurück	269	// oder NULL (nicht gefunden) zurk
270	//	270	//
271	// pre: -	271	// pre: -
272	// post: -	272	// post: -
Lines 326-332 Link Here
326	}	326	}
327		327
328	void* HashTable::Find(const char *Key) const	328	void* HashTable::Find(const char *Key) const
329	// Gibt Verweis des Objektes zurück, das unter Key abgespeichert ist,	329	// Gibt Verweis des Objektes zurk, das unter Key abgespeichert ist,
330	// oder NULL wenn nicht vorhanden.	330	// oder NULL wenn nicht vorhanden.
331	//	331	//
332	// pre: -	332	// pre: -
Lines 342-354 Link Here
342	}	342	}
343		343
344	void* HashTable::Delete( const char * Key)	344	void* HashTable::Delete( const char * Key)
345	// Löscht Objekt, das unter Key abgespeichert ist und gibt Verweis	345	// Lcht Objekt, das unter Key abgespeichert ist und gibt Verweis
346	// darauf zurück.	346	// darauf zurk.
347	// Gibt NULL zurück, wenn Key nicht vorhanden ist.	347	// Gibt NULL zurk, wenn Key nicht vorhanden ist.
348	//	348	//
349	// pre: -	349	// pre: -
350	// post: Objekt ist nicht mehr enthalten; m_lElem dekrementiert	350	// post: Objekt ist nicht mehr enthalten; m_lElem dekrementiert
351	// Wenn die HashTable der Owner ist, wurde das Object gelöscht	351	// Wenn die HashTable der Owner ist, wurde das Object gelcht
352	{	352	{
353	HashItem *pItem = FindPos(Key);	353	HashItem *pItem = FindPos(Key);
354		354
Lines 388-394 Link Here
388	unsigned long lOldSize = m_lSize; // alte Daten sichern	388	unsigned long lOldSize = m_lSize; // alte Daten sichern
389	HashItem* pOldData = m_pData;	389	HashItem* pOldData = m_pData;
390		390
391	m_lSize = unsigned long (m_dGrowFactor * m_lSize); // neue Größe	391	m_lSize = (unsigned long) (m_dGrowFactor * m_lSize); // neue Gre
392	m_pData = new HashItem[m_lSize]; // neue Daten holen	392	m_pData = new HashItem[m_lSize]; // neue Daten holen
393		393
394	// kein Speicher:	394	// kein Speicher:

Lines 111-122 Link Here

(-)./dtrans/source/win32/dnd/sourcecontext.cxx.orig (-2 / +2 lines)
111	}	111	}
112		112
113	void SAL_CALL SourceContext::setCursor( sal_Int32 cursorId )	113	void SAL_CALL SourceContext::setCursor( sal_Int32 cursorId )
114	throw( IllegalArgumentException, RuntimeException)	114	throw( RuntimeException)
115	{	115	{
116	}	116	}
117		117
118	void SAL_CALL SourceContext::setImage( sal_Int32 imageId )	118	void SAL_CALL SourceContext::setImage( sal_Int32 imageId )
119	throw( IllegalArgumentException, RuntimeException)	119	throw( RuntimeException)
120	{	120	{
121	}	121	}
122		122

Lines 48-53 Link Here

(-)./external/prj/d.lst.orig (+5 lines)
48	..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\*	48	..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\*
49	..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib	49	..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
50	..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a	50	..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
		51	..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
51	..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib	52	..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
52	..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a	53	..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
53	..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a	54	..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a
Lines 66-71 Link Here
66		67
67	..\%__SRC%\slb\gpc.lib %_DEST%\lib%_EXT%\gpc.lib	68	..\%__SRC%\slb\gpc.lib %_DEST%\lib%_EXT%\gpc.lib
68	..\%__SRC%\lib\libgpc.a %_DEST%\lib%_EXT%\libgpc.a	69	..\%__SRC%\lib\libgpc.a %_DEST%\lib%_EXT%\libgpc.a
		70	..\%__SRC%\lib\libgpc_static.a %_DEST%\lib%_EXT%\libgpc_static.a
69		71
70	..\%__SRC%\lib\libautorec. %_DEST%\lib%_EXT%\lib.	72	..\%__SRC%\lib\libautorec. %_DEST%\lib%_EXT%\lib.
71		73
Lines 79-84 Link Here
79	..\msvcp70\msvcp70.dll %_DEST%\bin%_EXT%\msvcp70.dll	81	..\msvcp70\msvcp70.dll %_DEST%\bin%_EXT%\msvcp70.dll
80	..\msvcp70\msvcr70.dll %_DEST%\bin%_EXT%\msvcr70.dll	82	..\msvcp70\msvcr70.dll %_DEST%\bin%_EXT%\msvcr70.dll
81		83
		84	..\msvcp71\msvcp71.dll %_DEST%\bin%_EXT%\msvcp71.dll
		85	..\msvcp71\msvcr71.dll %_DEST%\bin%_EXT%\msvcr71.dll
		86
82	..\unicows\unicows.dll %_DEST%\bin%_EXT%\unicows.dll	87	..\unicows\unicows.dll %_DEST%\bin%_EXT%\unicows.dll
83		88
84	..\X11\extensions\.h %_DEST%\inc%_EXT%\X11\extensions\.h	89	..\X11\extensions\.h %_DEST%\inc%_EXT%\X11\extensions\.h

Lines 131-150 Link Here

(-)./external/glibc/rtufiles/getopt.h.orig (-4 / +4 lines)
131	/* Many other libraries have conflicting prototypes for getopt, with	131	/* Many other libraries have conflicting prototypes for getopt, with
132	differences in the consts, in stdlib.h. To avoid compilation	132	differences in the consts, in stdlib.h. To avoid compilation
133	errors, only prototype getopt for the GNU C library. */	133	errors, only prototype getopt for the GNU C library. */
134	extern int getopt (int __argc, char const __argv, const char *__shortopts);	134	extern int getopt (int ___argc, char const ___argv, const char *__shortopts);
135	# else /* not __GNU_LIBRARY__ */	135	# else /* not __GNU_LIBRARY__ */
136	extern int getopt ();	136	extern int getopt ();
137	# endif /* __GNU_LIBRARY__ */	137	# endif /* __GNU_LIBRARY__ */
138		138
139	# ifndef __need_getopt	139	# ifndef __need_getopt
140	extern int getopt_long (int __argc, char const __argv, const char *__shortopts,	140	extern int getopt_long (int ___argc, char const ___argv, const char *__shortopts,
141	const struct option __longopts, int __longind);	141	const struct option __longopts, int __longind);
142	extern int getopt_long_only (int __argc, char const __argv,	142	extern int getopt_long_only (int ___argc, char const ___argv,
143	const char *__shortopts,	143	const char *__shortopts,
144	const struct option __longopts, int __longind);	144	const struct option __longopts, int __longind);
145		145
146	/* Internal only. Users should not call this directly. */	146	/* Internal only. Users should not call this directly. */
147	extern int _getopt_internal (int __argc, char const __argv,	147	extern int _getopt_internal (int ___argc, char const ___argv,
148	const char *__shortopts,	148	const char *__shortopts,
149	const struct option __longopts, int __longind,	149	const struct option __longopts, int __longind,
150	int __long_only);	150	int __long_only);

Lines 99-109 Link Here

(-)./bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx.orig (-56 / +66 lines)
99	// return	99	// return
100	typelib_TypeDescription * pReturnTypeDescr = 0;	100	typelib_TypeDescription * pReturnTypeDescr = 0;
101	if (pReturnTypeRef)	101	if (pReturnTypeRef)
		102	{
102	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );	103	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
103		104	}
		105
104	void * pUnoReturn = 0;	106	void * pUnoReturn = 0;
105	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need	107	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
106		108
107	if (pReturnTypeDescr)	109	if (pReturnTypeDescr)
108	{	110	{
109	if (cppu_isSimpleType( pReturnTypeDescr ))	111	if (cppu_isSimpleType( pReturnTypeDescr ))
Lines 114-120 Link Here
114	{	116	{
115	pCppReturn = (void *)pCppStack;	117	pCppReturn = (void *)pCppStack;
116	pCppStack += sizeof(void *);	118	pCppStack += sizeof(void *);
117		119
118	pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )	120	pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr )
119	? alloca( pReturnTypeDescr->nSize )	121	? alloca( pReturnTypeDescr->nSize )
120	: pCppReturn); // direct way	122	: pCppReturn); // direct way
Lines 132-140 Link Here
132	sal_Int32 * pTempIndizes = (sal_Int32 )(pUnoArgs + (2 nParams));	134	sal_Int32 * pTempIndizes = (sal_Int32 )(pUnoArgs + (2 nParams));
133	// type descriptions for reconversions	135	// type descriptions for reconversions
134	typelib_TypeDescription ppTempParamTypeDescr = (typelib_TypeDescription )(pUnoArgs + (3 * nParams));	136	typelib_TypeDescription ppTempParamTypeDescr = (typelib_TypeDescription )(pUnoArgs + (3 * nParams));
135		137
136	sal_Int32 nTempIndizes = 0;	138	sal_Int32 nTempIndizes = 0;
137		139
138	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )	140	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
139	{	141	{
140	const typelib_MethodParameter & rParam = pParams[nPos];	142	const typelib_MethodParameter & rParam = pParams[nPos];
Lines 170-178 Link Here
170	// is in/inout	172	// is in/inout
171	else if (cppu_relatesToInterface( pParamTypeDescr ))	173	else if (cppu_relatesToInterface( pParamTypeDescr ))
172	{	174	{
173	uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),	175	::uno_copyAndConvertData(
174	(void *)pCppStack, pParamTypeDescr,	176	pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
175	&pThis->pBridge->aCpp2Uno );	177	(void *)pCppStack, pParamTypeDescr,
		178	&pThis->pBridge->aCpp2Uno );
176	pTempIndizes[nTempIndizes] = nPos; // has to be reconverted	179	pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
177	// will be released at reconversion	180	// will be released at reconversion
178	ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;	181	ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
Lines 186-214 Link Here
186	}	189	}
187	pCppStack += sizeof(sal_Int32); // standard parameter length	190	pCppStack += sizeof(sal_Int32); // standard parameter length
188	}	191	}
189		192
190	// ExceptionHolder	193	// ExceptionHolder
191	uno_Any aUnoExc; // Any will be constructed by callee	194	uno_Any aUnoExc; // Any will be constructed by callee
192	uno_Any * pUnoExc = &aUnoExc;	195	uno_Any * pUnoExc = &aUnoExc;
193		196
194	// invoke uno dispatch call	197	// invoke uno dispatch call
195	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );	198	(*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
196		199
197	// in case an exception occured...	200	// in case an exception occured...
198	if (pUnoExc)	201	if (pUnoExc)
199	{	202	{
200	// destruct temporary in/inout params	203	// destruct temporary in/inout params
201	for ( ; nTempIndizes--; )	204	while (nTempIndizes--)
202	{	205	{
203	sal_Int32 nIndex = pTempIndizes[nTempIndizes];	206	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
204		207
205	if (pParams[nIndex].bIn) // is in/inout => was constructed	208	if (pParams[nIndex].bIn) // is in/inout => was constructed
206	uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );	209	{
		210	::uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
		211	}
207	TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );	212	TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
208	}	213	}
209	if (pReturnTypeDescr)	214	if (pReturnTypeDescr)
		215	{
210	TYPELIB_DANGER_RELEASE( pReturnTypeDescr );	216	TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
211		217	}
		218
212	raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any	219	raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any
213	// is here for dummy	220	// is here for dummy
214	return typelib_TypeClass_VOID;	221	return typelib_TypeClass_VOID;
Lines 216-236 Link Here
216	else // else no exception occured...	223	else // else no exception occured...
217	{	224	{
218	// temporary params	225	// temporary params
219	for ( ; nTempIndizes--; )	226	while (nTempIndizes--)
220	{	227	{
221	sal_Int32 nIndex = pTempIndizes[nTempIndizes];	228	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
222	typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];	229	typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
223		230
224	if (pParams[nIndex].bOut) // inout/out	231	if (pParams[nIndex].bOut) // inout/out
225	{	232	{
226	// convert and assign	233	// convert and assign
227	uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );	234	::uno_destructData(
228	uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,	235	pCppArgs[nIndex], pParamTypeDescr, cpp_release );
229	&pThis->pBridge->aUno2Cpp );	236	::uno_copyAndConvertData(
		237	pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
		238	&pThis->pBridge->aUno2Cpp );
230	}	239	}
231	// destroy temp uno param	240	// destroy temp uno param
232	uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );	241	::uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
233		242
234	TYPELIB_DANGER_RELEASE( pParamTypeDescr );	243	TYPELIB_DANGER_RELEASE( pParamTypeDescr );
235	}	244	}
236	// return	245	// return
Lines 238-247 Link Here
238	{	247	{
239	if (pUnoReturn != pCppReturn) // needs reconversion	248	if (pUnoReturn != pCppReturn) // needs reconversion
240	{	249	{
241	uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,	250	::uno_copyAndConvertData(
242	&pThis->pBridge->aUno2Cpp );	251	pCppReturn, pUnoReturn, pReturnTypeDescr,
		252	&pThis->pBridge->aUno2Cpp );
243	// destroy temp uno return	253	// destroy temp uno return
244	uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );	254	::uno_destructData(
		255	pUnoReturn, pReturnTypeDescr, 0 );
245	}	256	}
246	// complex return ptr is set to eax	257	// complex return ptr is set to eax
247	(void *)pRegisterReturn = pCppReturn;	258	(void *)pRegisterReturn = pCppReturn;
Lines 265-301 Link Here
265	sal_Int64 * pRegisterReturn /* space for register return */ )	276	sal_Int64 * pRegisterReturn /* space for register return */ )
266	{	277	{
267	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );	278	OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
268		279
269	// pCallStack: ret adr, [ret *], this, params	280	// pCallStack: ret adr, [ret *], this, params
270	// _this_ ptr is patched cppu_XInterfaceProxy object	281	// _this_ ptr is patched cppu_XInterfaceProxy object
271	cppu_cppInterfaceProxy * pCppI = NULL;	282	cppu_cppInterfaceProxy * pThis = NULL;
272	if( nVtableCall & 0x80000000 )	283	if( nVtableCall & 0x80000000 )
273	{	284	{
274	nVtableCall &= 0x7fffffff;	285	nVtableCall &= 0x7fffffff;
275	pCppI = (cppu_cppInterfaceProxy )(XInterface )*(pCallStack +2);	286	pThis = static_cast< cppu_cppInterfaceProxy * >(
		287	reinterpret_cast< XInterface * >( pCallStack[2] ) );
276	}	288	}
277	else	289	else
278	{	290	{
279	pCppI = (cppu_cppInterfaceProxy )(XInterface )*(pCallStack +1);	291	pThis = static_cast< cppu_cppInterfaceProxy * >(
		292	reinterpret_cast< XInterface * >( pCallStack[1] ) );
280	}	293	}
281		294
282	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr;	295	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
283		296
284	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );	297	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
285	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)	298	if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex)
286	{	299	{
287	throw RuntimeException(	300	throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!") ),
288	OUString::createFromAscii("illegal vtable index!"),	301	(XInterface *)pThis );
289	(XInterface *)pCppI );
290	}	302	}
291		303
292	// determine called method	304	// determine called method
293	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );	305	OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
294	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];	306	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall];
295	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );	307	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
296		308
297	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );	309	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
298		310
299	typelib_TypeClass eRet;	311	typelib_TypeClass eRet;
300	switch (aMemberDescr.get()->eTypeClass)	312	switch (aMemberDescr.get()->eTypeClass)
301	{	313	{
Lines 305-311 Link Here
305	{	317	{
306	// is GET method	318	// is GET method
307	eRet = cpp2uno_call(	319	eRet = cpp2uno_call(
308	pCppI, aMemberDescr.get(),	320	pThis, aMemberDescr.get(),
309	((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,	321	((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef,
310	0, 0, // no params	322	0, 0, // no params
311	pCallStack, pRegisterReturn );	323	pCallStack, pRegisterReturn );
Lines 318-326 Link Here
318	((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;	330	((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
319	aParam.bIn = sal_True;	331	aParam.bIn = sal_True;
320	aParam.bOut = sal_False;	332	aParam.bOut = sal_False;
321		333
322	eRet = cpp2uno_call(	334	eRet = cpp2uno_call(
323	pCppI, aMemberDescr.get(),	335	pThis, aMemberDescr.get(),
324	0, // indicates void return	336	0, // indicates void return
325	1, &aParam,	337	1, &aParam,
326	pCallStack, pRegisterReturn );	338	pCallStack, pRegisterReturn );
Lines 332-343 Link Here
332	// is METHOD	344	// is METHOD
333	switch (nVtableCall)	345	switch (nVtableCall)
334	{	346	{
		347	// standard XInterface vtable calls
335	case 1: // acquire()	348	case 1: // acquire()
336	pCppI->acquireProxy(); // non virtual call!	349	pThis->acquireProxy(); // non virtual call!
337	eRet = typelib_TypeClass_VOID;	350	eRet = typelib_TypeClass_VOID;
338	break;	351	break;
339	case 2: // release()	352	case 2: // release()
340	pCppI->releaseProxy(); // non virtual call!	353	pThis->releaseProxy(); // non virtual call!
341	eRet = typelib_TypeClass_VOID;	354	eRet = typelib_TypeClass_VOID;
342	break;	355	break;
343	case 0: // queryInterface() opt	356	case 0: // queryInterface() opt
Lines 345-356 Link Here
345	typelib_TypeDescription * pTD = 0;	358	typelib_TypeDescription * pTD = 0;
346	TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );	359	TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() );
347	if (pTD)	360	if (pTD)
348	{	361	{
349	XInterface * pInterface = 0;	362	XInterface * pInterface = 0;
350	(*pCppI->pBridge->pCppEnv->getRegisteredInterface)(	363	(*pThis->pBridge->pCppEnv->getRegisteredInterface)(
351	pCppI->pBridge->pCppEnv,	364	pThis->pBridge->pCppEnv,
352	(void *)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription )pTD );	365	(void *)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription )pTD );
353		366
354	if (pInterface)	367	if (pInterface)
355	{	368	{
356	::uno_any_construct(	369	::uno_any_construct(
Lines 367-373 Link Here
367	} // else perform queryInterface()	380	} // else perform queryInterface()
368	default:	381	default:
369	eRet = cpp2uno_call(	382	eRet = cpp2uno_call(
370	pCppI, aMemberDescr.get(),	383	pThis, aMemberDescr.get(),
371	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,	384	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef,
372	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,	385	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams,
373	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,	386	((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams,
Lines 378-385 Link Here
378	default:	391	default:
379	{	392	{
380	throw RuntimeException(	393	throw RuntimeException(
381	OUString::createFromAscii("no member description found!"),	394	OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ),
382	(XInterface *)pCppI );	395	(XInterface *)pThis );
383	// is here for dummy	396	// is here for dummy
384	eRet = typelib_TypeClass_VOID;	397	eRet = typelib_TypeClass_VOID;
385	}	398	}
Lines 546-552 Link Here
546		559
547	//==================================================================================================	560	//==================================================================================================
548	void SAL_CALL cppu_cppInterfaceProxy_patchVtable(	561	void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
549	XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()	562	XInterface * pThis, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
550	{	563	{
551	static MediateClassData * s_pMediateClassData = 0;	564	static MediateClassData * s_pMediateClassData = 0;
552	if (! s_pMediateClassData)	565	if (! s_pMediateClassData)
Lines 562-568 Link Here
562	#endif	575	#endif
563	}	576	}
564	}	577	}
565	(void const *)pCppI = s_pMediateClassData->get_vtable( pTypeDescr );	578	(void const *)pThis = s_pMediateClassData->get_vtable( pTypeDescr );
566	}	579	}
567		580
568	}	581	}
Lines 573-594 Link Here
573	sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )	586	sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
574	SAL_THROW_EXTERN_C()	587	SAL_THROW_EXTERN_C()
575	{	588	{
576	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload(	589	return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
577	&CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime );
578	}	590	}
579	//##################################################################################################	591	//##################################################################################################
580	void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )	592	void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv )
581	SAL_THROW_EXTERN_C()	593	SAL_THROW_EXTERN_C()
582	{	594	{
583	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment(	595	CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv );
584	pCppEnv );
585	}	596	}
586	//##################################################################################################	597	//##################################################################################################
587	void SAL_CALL uno_ext_getMapping(	598	void SAL_CALL uno_ext_getMapping(
588	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )	599	uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
589	SAL_THROW_EXTERN_C()	600	SAL_THROW_EXTERN_C()
590	{	601	{
591	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping(	602	CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo );
592	ppMapping, pFrom, pTo );
593	}	603	}
594	}	604	}

Lines 164-173 Link Here

(-)./bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx.orig (-52 / +65 lines)
164	sal_Int32 nParams, typelib_MethodParameter * pParams,	164	sal_Int32 nParams, typelib_MethodParameter * pParams,
165	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )	165	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
166	{	166	{
167	// max space for: [complex ret ptr], values\|ptr ...	167	// max space for: [complex ret ptr], values\|ptr ...
168	char * pCppStack =	168	char * pCppStack = (char )alloca( sizeof(sal_Int32) + ((nParams+2) sizeof(sal_Int64)) );
169	(char )alloca( sizeof(sal_Int32) + ((nParams+2) sizeof(sal_Int64)) );	169	char * pCppStackStart = pCppStack;
170	char * pCppStackStart = pCppStack;
171		170
172	// return	171	// return
173	typelib_TypeDescription * pReturnTypeDescr = 0;	172	typelib_TypeDescription * pReturnTypeDescr = 0;
Lines 196-201 Link Here
196	pCppStack += sizeof( void* );	195	pCppStack += sizeof( void* );
197		196
198	// stack space	197	// stack space
		198
199	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );	199	OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
200	// args	200	// args
201	void pCppArgs = (void )alloca( 3 * sizeof(void ) nParams );	201	void pCppArgs = (void )alloca( 3 * sizeof(void ) nParams );
Lines 214-221 Link Here
214		214
215	if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))	215	if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
216	{	216	{
217	uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,	217	::uno_copyAndConvertData(
218	&pThis->pBridge->aUno2Cpp );	218	pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
		219	&pThis->pBridge->aUno2Cpp );
219		220
220	switch (pParamTypeDescr->eTypeClass)	221	switch (pParamTypeDescr->eTypeClass)
221	{	222	{
Lines 232-238 Link Here
232	if (! rParam.bIn) // is pure out	233	if (! rParam.bIn) // is pure out
233	{	234	{
234	// cpp out is constructed mem, uno out is not!	235	// cpp out is constructed mem, uno out is not!
235	uno_constructData(	236	::uno_constructData(
236	(void *)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),	237	(void *)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
237	pParamTypeDescr );	238	pParamTypeDescr );
238	pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call	239	pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
Lines 242-250 Link Here
242	// is in/inout	243	// is in/inout
243	else if (cppu_relatesToInterface( pParamTypeDescr ))	244	else if (cppu_relatesToInterface( pParamTypeDescr ))
244	{	245	{
245	uno_copyAndConvertData(	246	::uno_copyAndConvertData(
246	(void *)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),	247	(void *)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
247	pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp );	248	pUnoArgs[nPos], pParamTypeDescr,
		249	&pThis->pBridge->aUno2Cpp );
248		250
249	pTempIndizes[nTempIndizes] = nPos; // has to be reconverted	251	pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
250	// will be released at reconversion	252	// will be released at reconversion
Lines 262-335 Link Here
262		264
263	try	265	try
264	{	266	{
265	OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );	267	OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" );
266	callVirtualMethod(	268	callVirtualMethod(
267	pThis->pCppI, nVtableCall,	269	pThis->pCppI, nVtableCall,
268	pCppReturn, pReturnTypeDescr->eTypeClass,	270	pCppReturn, pReturnTypeDescr->eTypeClass,
269	(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );	271	(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
270	// NO exception occured...
271	*ppUnoExc = 0;
272
273	// reconvert temporary params
274	for ( ; nTempIndizes--; )
275	{
276	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
277	typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
278		272
279	if (pParams[nIndex].bIn)	273	// NO exception occured...
		274	*ppUnoExc = 0;
		275
		276	// reconvert temporary params
		277	while (nTempIndizes--)
280	{	278	{
281	if (pParams[nIndex].bOut) // inout	279	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
		280	typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
		281
		282	if (pParams[nIndex].bIn)
282	{	283	{
283	uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value	284	if (pParams[nIndex].bOut) // inout
284	uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,	285	{
285	&pThis->pBridge->aCpp2Uno );	286	::uno_destructData(
		287	pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
		288	::uno_copyAndConvertData(
		289	pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
		290	&pThis->pBridge->aCpp2Uno );
		291	}
286	}	292	}
		293	else // pure out
		294	{
		295	::uno_copyAndConvertData(
		296	pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
		297	&pThis->pBridge->aCpp2Uno );
		298	}
		299	// destroy temp cpp param => cpp: every param was constructed
		300	::uno_destructData(
		301	pCppArgs[nIndex], pParamTypeDescr, cpp_release );
		302
		303	TYPELIB_DANGER_RELEASE( pParamTypeDescr );
287	}	304	}
288	else // pure out	305	// return value
		306	if (pCppReturn && pUnoReturn != pCppReturn)
289	{	307	{
290	uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,	308	::uno_copyAndConvertData(
291	&pThis->pBridge->aCpp2Uno );	309	pUnoReturn, pCppReturn, pReturnTypeDescr,
		310	&pThis->pBridge->aCpp2Uno );
		311	::uno_destructData(
		312	pCppReturn, pReturnTypeDescr, cpp_release );
292	}	313	}
293	// destroy temp cpp param => cpp: every param was constructed
294	uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
295
296	TYPELIB_DANGER_RELEASE( pParamTypeDescr );
297	}
298	// return value
299	if (pCppReturn && pUnoReturn != pCppReturn)
300	{
301	uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
302	&pThis->pBridge->aCpp2Uno );
303	uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
304	}
305	}	314	}
306	catch (...)	315	catch (...)
307	{	316	{
308	// fill uno exception	317	// fill uno exception
309	fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );	318	fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno );
310		319
311	// temporary params
312	for ( ; nTempIndizes--; )
313	{	320	{
314	sal_Int32 nIndex = pTempIndizes[nTempIndizes];	321	// temporary params
315	// destroy temp cpp param => cpp: every param was constructed	322	while (nTempIndizes--)
316	uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );	323	{
317	TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );	324	sal_Int32 nIndex = pTempIndizes[nTempIndizes];
		325	// destroy temp cpp param => cpp: every param was constructed
		326	::uno_destructData(
		327	pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
		328	TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
		329	}
318	}	330	}
319	// return type	331	// return type
320	if (pReturnTypeDescr)	332	if (pReturnTypeDescr)
		333	{
321	TYPELIB_DANGER_RELEASE( pReturnTypeDescr );	334	TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
		335	}
322	}	336	}
323	}	337	}
324		338
325
326	//==================================================================================================	339	//==================================================================================================
327	void SAL_CALL cppu_unoInterfaceProxy_dispatch(	340	void SAL_CALL cppu_unoInterfaceProxy_dispatch(
328	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,	341	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
329	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()	342	void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
330	{	343	{
331	// is my surrogate	344	// is my surrogate
332	cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI;	345	cppu_unoInterfaceProxy * pThis = static_cast< cppu_unoInterfaceProxy * >( pUnoI );
333	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;	346	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
334		347
335	switch (pMemberDescr->eTypeClass)	348	switch (pMemberDescr->eTypeClass)
Lines 360-366 Link Here
360	((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;	373	((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
361	aParam.bIn = sal_True;	374	aParam.bIn = sal_True;
362	aParam.bOut = sal_False;	375	aParam.bOut = sal_False;
363		376
364	typelib_TypeDescriptionReference * pReturnTypeRef = 0;	377	typelib_TypeDescriptionReference * pReturnTypeRef = 0;
365	OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );	378	OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
366	typelib_typedescriptionreference_new(	379	typelib_typedescriptionreference_new(
Lines 403-409 Link Here
403	typelib_TypeDescription * pTD = 0;	416	typelib_TypeDescription * pTD = 0;
404	TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );	417	TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
405	if (pTD)	418	if (pTD)
406	{	419	{
407	uno_Interface * pInterface = 0;	420	uno_Interface * pInterface = 0;
408	(*pThis->pBridge->pUnoEnv->getRegisteredInterface)(	421	(*pThis->pBridge->pUnoEnv->getRegisteredInterface)(
409	pThis->pBridge->pUnoEnv,	422	pThis->pBridge->pUnoEnv,

Lines 271-277 Link Here

(-)./config_office/configure.orig (-17 / +100 lines)
271	PACKAGE_STRING=	271	PACKAGE_STRING=
272	PACKAGE_BUGREPORT=	272	PACKAGE_BUGREPORT=
273		273
274	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_DEBUG ENABLE_SYMBOLS USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH USE_GCC3 GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH WDEVENV_PATH CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 SOLAR_JAVA JAVAC JAVA JAVA_HOME JDK XMKMF PERL TCSH PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB PSDK_HOME BISON FLEX PATCH GNUPATCH GNUCP CYGWIN ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN ANT ANT_HOME UPD LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN OSVERSION LIBOBJS LTLIBOBJS'	274	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_DEBUG ENABLE_SYMBOLS USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH USE_GCC3 GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH WDEVENV_PATH CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 SOLAR_JAVA JAVAC JAVA JAVA_HOME JDK XMKMF PERL TCSH PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB PSDK_HOME BISON FLEX PATCH GNUPATCH GNUCP CYGWIN ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN ANT ANT_HOME UPD LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN OSVERSION LIBOBJS LTLIBOBJS LIB_INCLUDE_PATH'
275	ac_subst_files=''	275	ac_subst_files=''
276		276
277	# Initialize some variables set by options.	277	# Initialize some variables set by options.
Lines 913-921 Link Here
913	Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>	913	Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>
914		914
915	--with-mspdb-path For Microsoft C/C++ compiler users, please supply the path	915	--with-mspdb-path For Microsoft C/C++ compiler users, please supply the path
916	pointing to the mspdb60.dll (MSVC 6) or mspdb60.dll (.NET).	916	pointing to the mspdb60.dll (MSVC 6) or mspdb7x.dll (.NET).
917		917
918	Usage: --with-mspdb-path=<absolute path to mspdb60.dll/mspdb70.dll>	918	Usage: --with-mspdb-path=<absolute path to mspdb60.dll/mspdb7x.dll>
919		919
920	--with-midl-path For Microsoft C/C++ .NET compiler users, please supply the path	920	--with-midl-path For Microsoft C/C++ .NET compiler users, please supply the path
921	pointing to the midl.exe.	921	pointing to the midl.exe.
Lines 3177-3182 Link Here
3177	if test "$WITH_MINGWIN" != "yes"; then	3177	if test "$WITH_MINGWIN" != "yes"; then
3178	echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5	3178	echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5
3179	echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6	3179	echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6
		3180	# Extract the first word of "mspdb71.dll", so it can be a program name with args.
		3181	set dummy mspdb71.dll; ac_word=$2
		3182	echo "$as_me:$LINENO: checking for $ac_word" >&5
		3183	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
		3184	if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
		3185	echo $ECHO_N "(cached) $ECHO_C" >&6
		3186	else
		3187	case $MSPDB_PATH in
		3188	[\\/]* \| ?:[\\/]*)
		3189	ac_cv_path_MSPDB_PATH="$MSPDB_PATH" # Let the user override the test with a path.
		3190	;;
		3191	*)
		3192	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
		3193	for as_dir in $PATH
		3194	do
		3195	IFS=$as_save_IFS
		3196	test -z "$as_dir" && as_dir=.
		3197	for ac_exec_ext in '' $ac_executable_extensions; do
		3198	if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
		3199	ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
		3200	echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
		3201	break 2
		3202	fi
		3203	done
		3204	done
		3205
		3206	;;
		3207	esac
		3208	fi
		3209	MSPDB_PATH=$ac_cv_path_MSPDB_PATH
		3210
		3211	if test -n "$MSPDB_PATH"; then
		3212	echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
		3213	echo "${ECHO_T}$MSPDB_PATH" >&6
		3214	else
		3215	echo "$as_me:$LINENO: result: no" >&5
		3216	echo "${ECHO_T}no" >&6
		3217	fi
		3218
		3219	if test -n "$MSPDB_PATH";then
		3220	MSPDB_PATH=`dirname $MSPDB_PATH`
		3221	fi
		3222	if test -e "$with_mspdb_path/mspdb71.dll"; then
		3223	MSPDB_PATH="$with_mspdb_path"
		3224	fi
		3225	if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb71.dll"; then
		3226	MSPDB_PATH="$with_cl_home/../Common7/IDE"
		3227	fi
		3228	if test -z "$MSPDB_PATH"; then
3180	# Extract the first word of "mspdb70.dll", so it can be a program name with args.	3229	# Extract the first word of "mspdb70.dll", so it can be a program name with args.
3181	set dummy mspdb70.dll; ac_word=$2	3230	set dummy mspdb70.dll; ac_word=$2
3182	echo "$as_me:$LINENO: checking for $ac_word" >&5	3231	echo "$as_me:$LINENO: checking for $ac_word" >&5
Lines 3280-3285 Link Here
3280	echo "$as_me: error: You need a mspdb?0.dll, make sure it's in the path or use --with-mspdb-path" >&2;}	3329	echo "$as_me: error: You need a mspdb?0.dll, make sure it's in the path or use --with-mspdb-path" >&2;}
3281	{ (exit 1); exit 1; }; }	3330	{ (exit 1); exit 1; }; }
3282	fi	3331	fi
		3332	fi
3283	MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`	3333	MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
3284	MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`	3334	MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
3285	PATH="$MSPDB_PATH:$PATH"	3335	PATH="$MSPDB_PATH:$PATH"
Lines 3353-3371 Link Here
3353	}"`	3403	}"`
3354	echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5	3404	echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5
3355	echo "${ECHO_T}found Compiler version $CCNUMVER." >&6	3405	echo "${ECHO_T}found Compiler version $CCNUMVER." >&6
3356	if test $CCNUMVER -ge "001300000000"; then	3406	if test $CCNUMVER -ge "001300100000"; then
3357	COMEX=8	3407	COMEX=10
3358	else	3408	else
3359	if test $CCNUMVER -ge "001200000000"; then	3409	if test $CCNUMVER -ge "001300000000"; then
3360	if test "$with_old_psdk" != "yes"; then	3410	COMEX=8
3361	COMEX=9	3411	else
		3412	if test $CCNUMVER -ge "001200000000"; then
		3413	if test "$with_old_psdk" != "yes"; then
		3414	COMEX=9
		3415	else
		3416	COMEX=7
		3417	fi
3362	else	3418	else
3363	COMEX=7	3419	{ { echo "$as_me:$LINENO: error: Compiler too old." >&5
		3420	echo "$as_me: error: Compiler too old." >&2;}
		3421	{ (exit 1); exit 1; }; }
3364	fi	3422	fi
3365	else
3366	{ { echo "$as_me:$LINENO: error: Compiler too old." >&5
3367	echo "$as_me: error: Compiler too old." >&2;}
3368	{ (exit 1); exit 1; }; }
3369	fi	3423	fi
3370	fi	3424	fi
3371	else	3425	else
Lines 3376-3382 Link Here
3376	else	3430	else
3377	echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5	3431	echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5
3378	echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6	3432	echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6
3379	if test `$CC -dumpmachine \| $AWK -F- '{ print $3 }'` = "mingw32"; then	3433	if test `$CC -dumpmachine \| $AWK -F- '{ print $1 }'` = "mingw32"; then
3380	echo "$as_me:$LINENO: result: found." >&5	3434	echo "$as_me:$LINENO: result: found." >&5
3381	echo "${ECHO_T}found." >&6	3435	echo "${ECHO_T}found." >&6
3382	else	3436	else
Lines 3389-3395 Link Here
3389		3443
3390		3444
3391		3445
3392	if test "$COMEX" = "8"; then	3446	if test "$COMEX" = "8" -o "$COMEX" = "10" ; then
3393	# Extract the first word of "midl.exe", so it can be a program name with args.	3447	# Extract the first word of "midl.exe", so it can be a program name with args.
3394	set dummy midl.exe; ac_word=$2	3448	set dummy midl.exe; ac_word=$2
3395	echo "$as_me:$LINENO: checking for $ac_word" >&5	3449	echo "$as_me:$LINENO: checking for $ac_word" >&5
Lines 3432-3444 Link Here
3432	if test -n "$MIDL_PATH";then	3486	if test -n "$MIDL_PATH";then
3433	MIDL_PATH=`dirname $MIDL_PATH`	3487	MIDL_PATH=`dirname $MIDL_PATH`
3434	fi	3488	fi
3435	if test -x "$with_midl_path/midl.exe"; then	3489	if test -e "$with_midl_path/midl.exe"; then
3436	MIDL_PATH="$with_midl_path"	3490	MIDL_PATH="$with_midl_path"
3437	fi	3491	fi
3438	if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then	3492	if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
3439	MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"	3493	MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
3440	fi	3494	fi
3441	if test ! -x "$MIDL_PATH/midl.exe"; then	3495	if test ! -e "$MIDL_PATH/midl.exe"; then
3442	{ { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5	3496	{ { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5
3443	echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;}	3497	echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;}
3444	{ (exit 1); exit 1; }; }	3498	{ (exit 1); exit 1; }; }
Lines 4287-4292 Link Here
4287	fi	4341	fi
4288	GXX_INCLUDE_PATH="$_gxx_include_path"	4342	GXX_INCLUDE_PATH="$_gxx_include_path"
4289		4343
		4344	if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
		4345	_lib_include_path=`echo "#include <stddef.h>" \| $CC -E - \| $SED -n '/.1"\(.\)\/stddef.h"./s//\1/p' \| sort -u \| xargs echo`
		4346	else
		4347	_lib_include_path="NO_LIB_INCLUDE"
		4348	fi
		4349	LIB_INCLUDE_PATH="$_lib_include_path"
4290		4350
4291	if test "$_os" = "SunOS"; then	4351	if test "$_os" = "SunOS"; then
4292	if test "$CC" = "cc"; then	4352	if test "$CC" = "cc"; then
Lines 7638-7643 Link Here
7638	fi	7698	fi
7639		7699
7640		7700
		7701	if test "$_os" = "WINNT" -a "$COMEX" = "10"; then
		7702	echo "$as_me:$LINENO: checking msvcp71.dll" >&5
		7703	echo $ECHO_N "checking msvcp71.dll... $ECHO_C" >&6
		7704	if test -f ../external/msvcp71/msvcp71.dll; then
		7705	echo "$as_me:$LINENO: result: found" >&5
		7706	echo "${ECHO_T}found" >&6
		7707	else
		7708	{ { echo "$as_me:$LINENO: error: The msvcp71.dll is missing in external/msvcp71/.
		7709	The dll is part of the .NET installation and can be found in a directory
		7710	similar to:
		7711	\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\"
		7712	Please copy the file to external/msvcp71." >&5
		7713	echo "$as_me: error: The msvcp71.dll is missing in external/msvcp71/.
		7714	The dll is part of the .NET installation and can be found in a directory
		7715	similar to:
		7716	\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\"
		7717	Please copy the file to external/msvcp71." >&2;}
		7718	{ (exit 1); exit 1; }; }
		7719	fi
		7720	fi
		7721
		7722
7641	WITH_GPC=NO	7723	WITH_GPC=NO
7642	WITH_LIBART=NO	7724	WITH_LIBART=NO
7643		7725
Lines 8803-8808 Link Here
8803	s,@OSVERSION@,$OSVERSION,;t t	8885	s,@OSVERSION@,$OSVERSION,;t t
8804	s,@LIBOBJS@,$LIBOBJS,;t t	8886	s,@LIBOBJS@,$LIBOBJS,;t t
8805	s,@LTLIBOBJS@,$LTLIBOBJS,;t t	8887	s,@LTLIBOBJS@,$LTLIBOBJS,;t t
		8888	s,@LIB_INCLUDE_PATH@,$LIB_INCLUDE_PATH,;t t
8806	CEOF	8889	CEOF
8807		8890
8808	_ACEOF	8891	_ACEOF

Lines 274-280 Link Here

(-)./xml2cmp/source/xcd/parse.cxx.orig (-3 / +5 lines)
274		274
275	Get_Attribute(sAttrValue, sAttrName);	275	Get_Attribute(sAttrValue, sAttrName);
276		276
277	for ( unsigned i = 0; i < nSize; ++i )	277	unsigned i = 0;
		278	for ( ; i < nSize; ++i )
278	{	279	{
279	if ( i_rAttrNames[i] == sAttrName )	280	if ( i_rAttrNames[i] == sAttrName )
280	{	281	{
Lines 366-372 Link Here
366	{	367	{
367	char * pResult = &sWord[0];	368	char * pResult = &sWord[0];
368		369
369	for ( char * pSet = pResult;	370	char * pSet = pResult;
		371	for ( ;
370	*text != i_cEnd;	372	*text != i_cEnd;
371	++text )	373	++text )
372	{	374	{
Lines 383-389 Link Here
383		385
384	if (i_bReverseName)	386	if (i_bReverseName)
385	{	387	{
386	const nMaxLen = 1000;	388	const int nMaxLen = 1000;
387	if (strlen(pResult) < nMaxLen)	389	if (strlen(pResult) < nMaxLen)
388	{	390	{
389	char * sBreak = strrchr(pResult,'.');	391	char * sBreak = strrchr(pResult,'.');

Lines 132-137 Link Here

(-)./sal/systools/win32/uwinapi/macros.h.orig (-1 / +68 lines)
132		132
133		133
134		134
		135	#ifdef __MINGW32__
		136	#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
		137	static void func##_Thunk(); \
		138	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
		139	EXTERN_C rettype calltype func params \
		140	{ \
		141	asm(" popl %ebp"); \
		142	asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \
		143	} \
		144	EXTERN_C rettype calltype func##_##resolve params; \
		145	static rettype calltype func##_##Failure params; \
		146	static void func##_Thunk() \
		147	{ \
		148	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
		149	asm(" movl %ebp, %esp"); \
		150	asm(" popl %ebp"); \
		151	asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \
		152	} \
		153	static rettype calltype func##_##Failure params \
		154	{ \
		155	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
		156	return (rettype)0; \
		157	} \
		158	EXTERN_C rettype calltype func##_##resolve params
		159	#else
135	#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \	160	#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \
136	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \	161	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
137	EXTERN_C rettype calltype func##_##resolve params; \	162	EXTERN_C rettype calltype func##_##resolve params; \
Lines 152-160 Link Here
152	return (rettype)0; \	177	return (rettype)0; \
153	} \	178	} \
154	EXTERN_C rettype calltype func##_##resolve params	179	EXTERN_C rettype calltype func##_##resolve params
		180	#endif
155		181
156		182
157		183
		184	#ifdef __MINGW32__
		185	#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
		186	static void func##_Thunk(); \
		187	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
		188	static void func##_Thunk() \
		189	{ \
		190	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
		191	asm(" movl %ebp, %esp"); \
		192	asm(" popl %ebp"); \
		193	asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \
		194	} \
		195	EXTERN_C rettype calltype func params \
		196	{ \
		197	asm(" popl %ebp"); \
		198	asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \
		199	}
		200	#else
158	#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \	201	#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
159	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \	202	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
160	static _declspec ( naked ) void func##_Thunk() \	203	static _declspec ( naked ) void func##_Thunk() \
Lines 167-175 Link Here
167	_asm jmp [module##_##func##_Ptr] \	210	_asm jmp [module##_##func##_Ptr] \
168	} \	211	} \
169	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;	212	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
		213	#endif
170		214
171		215
172		216	#ifdef __MINGW32__
		217	#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
		218	static void func##_Thunk(); \
		219	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
		220	static rettype calltype func##_##Failure params; \
		221	static _declspec ( naked ) void func##_Thunk() \
		222	{ \
		223	ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \
		224	asm(" movl %ebp, %esp"); \
		225	asm(" popl %ebp"); \
		226	asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \
		227	} \
		228	EXTERN_C _declspec( naked ) rettype calltype func params \
		229	{ \
		230	asm(" popl %ebp"); \
		231	asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \
		232	} \
		233	static rettype calltype func##_##Failure params \
		234	{ \
		235	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
		236	return (rettype)0; \
		237	}
		238	#else
173	#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \	239	#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \
174	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \	240	EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
175	static rettype calltype func##_##Failure params; \	241	static rettype calltype func##_##Failure params; \
Lines 188-191 Link Here
188	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \	254	SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \
189	return (rettype)0; \	255	return (rettype)0; \
190	}	256	}
		257	#endif
191		258

Lines 87-97 Link Here

(-)./sal/osl/w32/tempfile.c.orig (+9 lines)
87		87
88	oslFileError MapWindowsErrorToOSLError( DWORD dwError );	88	oslFileError MapWindowsErrorToOSLError( DWORD dwError );
89		89
		90	#ifndef __MINGW32__
90	/* Allocate n number of t's on the stack	91	/* Allocate n number of t's on the stack
91	return a pointer to it in p */	92	return a pointer to it in p */
92		93
93	#define STACK_ALLOC(p, t, n) __try {(p) = _alloca((n)*sizeof(t));} \	94	#define STACK_ALLOC(p, t, n) __try {(p) = _alloca((n)*sizeof(t));} \
94	__except(EXCEPTION_EXECUTE_HANDLER) {(p) = NULL;}	95	__except(EXCEPTION_EXECUTE_HANDLER) {(p) = NULL;}
		96	#endif
95		97
96	/* =============================== */	98	/* =============================== */
97	/* osl_gettempDirURL */	99	/* osl_gettempDirURL */
Lines 319-326 Link Here
319	if (osl_File_E_None != osl_error)	321	if (osl_File_E_None != osl_error)
320	return osl_error;	322	return osl_error;
321		323
		324	#ifdef __MINGW32__
		325	tmp_name = malloc((rtl_uString_getLength(base_directory) + MAX_PATH)*sizeof(WCHAR));
		326	#else
322	/* allocate enough space on the stack */	327	/* allocate enough space on the stack */
323	STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH));	328	STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH));
		329	#endif
324		330
325	if (tmp_name)	331	if (tmp_name)
326	{	332	{
Lines 330-335 Link Here
330	b_delete_on_close,	336	b_delete_on_close,
331	pHandle,	337	pHandle,
332	ppustrTempFileURL);	338	ppustrTempFileURL);
		339	#ifdef __MINGW32__
		340	free(tmp_name);
		341	#endif
333	}	342	}
334	else // stack alloc failed	343	else // stack alloc failed
335	{	344	{

Lines 139-144 Link Here

(-)./vcl/win/source/window/salframe.cxx.orig (-1 / +30 lines)
139	#ifndef _SV_SVAPP_HXX	139	#ifndef _SV_SVAPP_HXX
140	#include <svapp.hxx>	140	#include <svapp.hxx>
141	#endif	141	#endif
		142	#ifdef __MINGW32__
		143
		144	#define SM_XVIRTUALSCREEN 76
		145	#define SM_YVIRTUALSCREEN 77
		146	#define SM_CXVIRTUALSCREEN 78
		147	#define SM_CYVIRTUALSCREEN 79
		148	#define SM_CMONITORS 80
		149	#define SM_SAMEDISPLAYFORMAT 81
		150
		151	// HMONITOR is already declared if WINVER >= 0x0500 in windef.h
		152	// This is for components built with an older version number.
		153	//
		154	#if !defined(HMONITOR_DECLARED) && (WINVER < 0x0500)
		155	DECLARE_HANDLE(HMONITOR);
		156	#define HMONITOR_DECLARED
		157	#endif
		158
		159	#ifndef CCHDEVICENAME
		160	#define CCHDEVICENAME 32
		161	#endif
		162
		163	#ifndef DISPLAY_DEVICE_ATTACHED_TO_DESKTOP
		164	#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001
		165	#define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002
		166	#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004
		167	#define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008
		168	#define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010
		169	#endif
		170	#endif
142	#define COMPILE_MULTIMON_STUBS	171	#define COMPILE_MULTIMON_STUBS
143	#include <multimon.h>	172	#include <multimon.h>
144		173
Lines 2702-2708 Link Here
2702		2731
2703	StyleSettings aStyleSettings = rSettings.GetStyleSettings();	2732	StyleSettings aStyleSettings = rSettings.GetStyleSettings();
2704	BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE \| STYLE_OPTION_UNIXSTYLE)) == 0;	2733	BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE \| STYLE_OPTION_UNIXSTYLE)) == 0;
2705	#if (_MSC_VER < 1300)	2734	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
2706	aStyleSettings.SetScrollBarSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); // #99956# do not allow huge scrollbars, most of the UI is not scaled anymore	2735	aStyleSettings.SetScrollBarSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); // #99956# do not allow huge scrollbars, most of the UI is not scaled anymore
2707	aStyleSettings.SetSpinSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) );	2736	aStyleSettings.SetSpinSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) );
2708	#else	2737	#else

Lines 6177-6183 Link Here

(-)./vcl/source/gdi/outdev3.cxx.orig (-5 / +5 lines)
6177	nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));	6177	nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));
6178		6178
6179	Point aTempPos = LogicToPixel( aPos );	6179	Point aTempPos = LogicToPixel( aPos );
6180	#if (_MSC_VER < 1300)	6180	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
6181	nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min( lc_x1, lc_x2 ) );	6181	nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min( lc_x1, lc_x2 ) );
6182	#else	6182	#else
6183	nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min( lc_x1, lc_x2 ) );	6183	nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min( lc_x1, lc_x2 ) );
Lines 6251-6257 Link Here
6251	nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));	6251	nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));
6252		6252
6253	Point aTempPos = LogicToPixel( aPos );	6253	Point aTempPos = LogicToPixel( aPos );
6254	#if (_MSC_VER < 1300)	6254	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
6255	nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min(lc_x1, lc_x2) );	6255	nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min(lc_x1, lc_x2) );
6256	#else	6256	#else
6257	nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min(lc_x1, lc_x2) );	6257	nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min(lc_x1, lc_x2) );
Lines 6607-6613 Link Here
6607	long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];	6607	long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ];
6608	nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));	6608	nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2));
6609		6609
6610	#if (_MSC_VER < 1300)	6610	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
6611	Point aTempPos( std::min(lc_x1,lc_x2), GetFontMetric().GetAscent() );	6611	Point aTempPos( std::min(lc_x1,lc_x2), GetFontMetric().GetAscent() );
6612	if( bInvalidPos ) // #106952#, place behind the (last) character	6612	if( bInvalidPos ) // #106952#, place behind the (last) character
6613	aTempPos = Point( std::max(lc_x1,lc_x2), GetFontMetric().GetAscent() );	6613	aTempPos = Point( std::max(lc_x1,lc_x2), GetFontMetric().GetAscent() );
Lines 7094-7100 Link Here
7094	long nXOffset = 0;	7094	long nXOffset = 0;
7095	if( nBase != nIndex )	7095	if( nBase != nIndex )
7096	{	7096	{
7097	#if (_MSC_VER < 1300)	7097	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
7098	xub_StrLen nStart = std::min( nBase, nIndex );	7098	xub_StrLen nStart = std::min( nBase, nIndex );
7099	xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart;	7099	xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart;
7100	#else	7100	#else
Lines 7302-7308 Link Here
7302	long nXOffset = 0;	7302	long nXOffset = 0;
7303	if( nBase != nIndex )	7303	if( nBase != nIndex )
7304	{	7304	{
7305	#if (_MSC_VER < 1300)	7305	#if (_MSC_VER < 1300) && !defined(__MINGW32__)
7306	xub_StrLen nStart = std::min( nBase, nIndex );	7306	xub_StrLen nStart = std::min( nBase, nIndex );
7307	xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart;	7307	xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart;
7308	#else	7308	#else

Lines 21-33 Link Here

(-)./desktop/prj/d.lst.orig (+5 lines)
21	..\%__SRC%\bin\spl.dll %_DEST%\bin%_EXT%\spl.dll	21	..\%__SRC%\bin\spl.dll %_DEST%\bin%_EXT%\spl.dll
22	..\%__SRC%\bin\socomp.dll %_DEST%\bin%_EXT%\socomp.dll	22	..\%__SRC%\bin\socomp.dll %_DEST%\bin%_EXT%\socomp.dll
23	..\%__SRC%\lib\libwrp.so %_DEST%\lib%_EXT%\libwrp.so	23	..\%__SRC%\lib\libwrp.so %_DEST%\lib%_EXT%\libwrp.so
		24	..\%__SRC%\lib\libwrp.a %_DEST%\lib%_EXT%\libwrp.a
24	..\%__SRC%\lib\libwrp.dylib %_DEST%\lib%_EXT%\libwrp.dylib	25	..\%__SRC%\lib\libwrp.dylib %_DEST%\lib%_EXT%\libwrp.dylib
25	..\%__SRC%\lib\libspl.so %_DEST%\lib%_EXT%\libspl.so	26	..\%__SRC%\lib\libspl.so %_DEST%\lib%_EXT%\libspl.so
		27	..\%__SRC%\lib\libspl.a %_DEST%\lib%_EXT%\libspl.a
26	..\%__SRC%\lib\libspl.dylib %_DEST%\lib%_EXT%\libspl.dylib	28	..\%__SRC%\lib\libspl.dylib %_DEST%\lib%_EXT%\libspl.dylib
27	..\%__SRC%\lib\libsocomp.so %_DEST%\lib%_EXT%\libsocomp.so	29	..\%__SRC%\lib\libsocomp.so %_DEST%\lib%_EXT%\libsocomp.so
		30	..\%__SRC%\lib\libsocomp.a %_DEST%\lib%_EXT%\libsocomp.a
28	..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib%_EXT%\libsocomp.dylib	31	..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib%_EXT%\libsocomp.dylib
29	..\%__SRC%\bin\offacc.dll %_DEST%\bin%_EXT%\offacc.dll	32	..\%__SRC%\bin\offacc.dll %_DEST%\bin%_EXT%\offacc.dll
30	..\%__SRC%\lib\liboffacc.so %_DEST%\lib%_EXT%\liboffacc.so	33	..\%__SRC%\lib\liboffacc.so %_DEST%\lib%_EXT%\liboffacc.so
		34	..\%__SRC%\lib\liboffacc.a %_DEST%\lib%_EXT%\liboffacc.a
31	..\%__SRC%\lib\liboffacc.dylib %_DEST%\lib%_EXT%\liboffacc.dylib	35	..\%__SRC%\lib\liboffacc.dylib %_DEST%\lib%_EXT%\liboffacc.dylib
32		36
33	..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin	37	..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin
Lines 39-44 Link Here
39	..\%__SRC%\bin\pkgchk %_DEST%\bin%_EXT%\pkgchk.bin	43	..\%__SRC%\bin\pkgchk %_DEST%\bin%_EXT%\pkgchk.bin
40	..\%__SRC%\bin\pkgchk.dll %_DEST%\bin%_EXT%\pkgchk.dll	44	..\%__SRC%\bin\pkgchk.dll %_DEST%\bin%_EXT%\pkgchk.dll
41	..\%__SRC%\lib\libpkgchk.so %_DEST%\lib%_EXT%\libpkgchk.so	45	..\%__SRC%\lib\libpkgchk.so %_DEST%\lib%_EXT%\libpkgchk.so
		46	..\%__SRC%\lib\libpkgchk.a %_DEST%\lib%_EXT%\libpkgchk.a
42	..\%__SRC%\lib\libpkgchk.dylib %_DEST%\lib%_EXT%\libpkgchk.dylib	47	..\%__SRC%\lib\libpkgchk.dylib %_DEST%\lib%_EXT%\libpkgchk.dylib
43		48
44	..\%__SRC%\bin\pagein %_DEST%\bin%_EXT%\pagein	49	..\%__SRC%\bin\pagein %_DEST%\bin%_EXT%\pagein

Lines 1-6 Link Here

(-)./winmingw.set.orig (-13 / +13 lines)
1	# #################################################################	1	# #################################################################
2	# OpenOffice.org 645 build environment file for: WINNT.	2	# OpenOffice.org 645 build environment file for: WINNT.
3	# Generated on: Sun Oct 5 00:00:29 2003	3	# Generated on: Sat Jan 17 23:30:09 2004
4	# Source this file to set up the build environment.	4	# Source this file to set up the build environment.
5	# 1. exec (t)csh	5	# 1. exec (t)csh
6	# 2. source winmingw.set	6	# 2. source winmingw.set
Lines 8-14 Link Here
8	setenv SRC_ROOT "/cygdrive/d/work/ooo_1.1rc4_src"	8	setenv SRC_ROOT "/cygdrive/d/work/ooo_1.1rc4_src"
9	setenv SHELL "/usr/bin/tcsh"	9	setenv SHELL "/usr/bin/tcsh"
10	setenv JAVA_HOME "/cygdrive/h/j2sdk1.4.1_03"	10	setenv JAVA_HOME "/cygdrive/h/j2sdk1.4.1_03"
11	setenv ANT_HOME "/cygdrive/h/apache-ant-1.5.4"	11	setenv ANT_HOME "/cygdrive/h/apache-ant-1.5.4/"
12	setenv JDKLIB "/cygdrive/h/j2sdk1.4.1_03/lib"	12	setenv JDKLIB "/cygdrive/h/j2sdk1.4.1_03/lib"
13	setenv STLPORT4 "NO_STLPORT4"	13	setenv STLPORT4 "NO_STLPORT4"
14	setenv ASM_PATH "NO_ASM_HOME"	14	setenv ASM_PATH "NO_ASM_HOME"
Lines 67-73 Link Here
67	#	67	#
68	setenv SOLAR_JAVA "TRUE"	68	setenv SOLAR_JAVA "TRUE"
69	setenv COM "GCC"	69	setenv COM "GCC"
70	setenv COMPATH "/cygdrive/h/mingw/bin"	70	setenv COMPATH "h:/mingw"
71	setenv CPU "I"	71	setenv CPU "I"
72	setenv CPUNAME "INTEL"	72	setenv CPUNAME "INTEL"
73	setenv CVER "C300"	73	setenv CVER "C300"
Lines 91-97 Link Here
91	setenv SET_EXCEPTIONS "TRUE"	91	setenv SET_EXCEPTIONS "TRUE"
92	setenv emergency "FALSE"	92	setenv emergency "FALSE"
93	setenv use_shl_versions "TRUE"	93	setenv use_shl_versions "TRUE"
94	setenv WRAPCMD "guw.pl"	94	setenv WRAPCMD "gum.pl"
95		95
96	#	96	#
97	# Variable values.	97	# Variable values.
Lines 113-119 Link Here
113	setenv SOLARROOT "$SRC_ROOT"	113	setenv SOLARROOT "$SRC_ROOT"
114	setenv RSCRES "$SRC_ROOT"	114	setenv RSCRES "$SRC_ROOT"
115	setenv SOLARVER "/cygdrive/d/work/ooo_1.1rc4_src/solver"	115	setenv SOLARVER "/cygdrive/d/work/ooo_1.1rc4_src/solver"
116	setenv SOLARVERSION "$SOLARVER/645"	116	setenv SOLARVERSION "d:/work/ooo_1.1rc4_src/solver/645"
117	setenv SOLARENV "/cygdrive/d/work/ooo_1.1rc4_src/solenv"	117	setenv SOLARENV "/cygdrive/d/work/ooo_1.1rc4_src/solenv"
118	setenv SOLARENVINC "$SOLARENV/inc"	118	setenv SOLARENVINC "$SOLARENV/inc"
119	setenv LOCALINI "$SOLARENV/config"	119	setenv LOCALINI "$SOLARENV/config"
Lines 127-136 Link Here
127	setenv DMAKEROOT "$SOLARENVINC/startup"	127	setenv DMAKEROOT "$SOLARENVINC/startup"
128	setenv CLASSPATH "$JAVA_HOME/jre/lib/rt.jar:."	128	setenv CLASSPATH "$JAVA_HOME/jre/lib/rt.jar:."
129	setenv XCLASSPATH "$JAVA_HOME/jre/lib/rt.jar:."	129	setenv XCLASSPATH "$JAVA_HOME/jre/lib/rt.jar:."
130	setenv SOLARINCLUDES " -I/cygdrive/d/work/ooo_1.1rc4_src/solver/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/wntgcci.pro/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/inc -I'/cygdrive/H/SDK/include'"	130	setenv SOLARINCLUDES "-I/cygdrive/d/work/ooo_1.1rc4_src/solver/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/wntgcci.pro/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/inc -I$COMPATH/include -I/cygdrive/h/mingw/lib/gcc-lib/mingw32/3.3.1/include -I/cygdrive/h/mingw/include/c++/3.3.1 -I/cygdrive/h/mingw/include/c++/3.3.1/mingw32 -I'/cygdrive/H/SDK/include'"
131	setenv PATH ".:$SOLARVER/$UPD/$INPATH/bin:$SOLARENV/bin:$SOLARENV/$OUTPATH/bin:/cygdrive/h/j2sdk1.4.1_03/bin:/cygdrive/h/j2sdk1.4.1_03/jre/bin/client:/cygdrive/h/mingw/bin:/usr/local/bin:/usr/bin:/bin:/cygdrive/h/Perl/bin/:/cygdrive/h/WINDOWS/system32:/cygdrive/h/WINDOWS:/cygdrive/h/WINDOWS/System32/Wbem:/cygdrive/h/Program Files/ATI Technologies/ATI Control Panel:/cygdrive/h/Program Files/Real/Helix Producer Basic:/cygdrive/h/SDK/Bin/.:/cygdrive/h/SDK/Bin/WinNT/.:/cygdrive/h/SDK/Bin/.:/cygdrive/h/SDK/Bin/WinNT/.:/cygdrive/h/usr:/cygdrive/c"	131	setenv PATH ".:$SOLARVER/$UPD/$INPATH/bin:$SOLARENV/bin:$SOLARENV/$OUTPATH/bin:/cygdrive/h/j2sdk1.4.1_03/bin:/cygdrive/h/j2sdk1.4.1_03/jre/bin/client:/cygdrive/h/mingw/bin:/usr/local/bin:/usr/bin:/bin:/cygdrive/h/Perl/bin/:/cygdrive/h/WINDOWS/system32:/cygdrive/h/WINDOWS:/cygdrive/h/WINDOWS/System32/Wbem:/cygdrive/h/Program Files/ATI Technologies/ATI Control Panel:/cygdrive/h/Program Files/Real/Helix Producer Basic:/cygdrive/h/SDK/Bin/.:/cygdrive/h/SDK/Bin/WinNT/.:/cygdrive/h/SDK/Bin/.:/cygdrive/h/SDK/Bin/WinNT/.:/cygdrive/h/usr:/cygdrive/c"
132	setenv SOLARLIB " -L$SOLARVER/$UPD/$INPATH/lib -L../lib -L$SOLARENV/$OUTPATH/lib"	132	setenv SOLARLIB "-L$SOLARVER/$UPD/$INPATH/lib -L../lib -L$SOLARENV/$OUTPATH/lib"
133	setenv SOLARINC " -I. -I$SOLARVER/$UPD/$INPATH/inc/stl -I$SOLARVER/$UPD/$INPATH/inc/external -I$SOLARVER/$UPD/$INPATH/inc -I$SOLARENV/$OUTPATH/inc -I$SOLARENV/inc -I$SRC_ROOT/res -I/cygdrive/d/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/stl -I$JAVA_HOME/include/win32 -I$JAVA_HOME/include -I'/cygdrive/H/SDK/include'"	133	setenv SOLARINC "-I. -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/stl -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/external -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc -Id:/work/ooo_1.1rc4_src/solenv/wntgcci/inc -Id:/work/ooo_1.1rc4_src/solenv/inc -Id:/work/ooo_1.1rc4_src/res -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/stl -Ih:/j2sdk1.4.1_03/include/win32 -Ih:/j2sdk1.4.1_03/include -Ih:/mingw/include -Ih:/mingw/lib/gcc-lib/mingw32/3.3.1/include -Ih:/mingw/include/c++/3.3.1 -Ih:/mingw/include/c++/3.3.1/mingw32 -Ih:/SDK/include"
134	setenv COMP_ENV "wntgcci"	134	setenv COMP_ENV "wntgcci"
135	setenv JAVAHOME "$JAVA_HOME"	135	setenv JAVAHOME "$JAVA_HOME"
136	setenv CC "gcc -mno-cygwin"	136	setenv CC "gcc -mno-cygwin"
Lines 145-157 Link Here
145	setenv WITH_LIBSN "NO"	145	setenv WITH_LIBSN "NO"
146	setenv LIBSN_CFLAGS ""	146	setenv LIBSN_CFLAGS ""
147	setenv LIBSN_LIBS ""	147	setenv LIBSN_LIBS ""
148	setenv GXX_INCLUDE_PATH "h:/mingw/include/c++/3.2.3"	148	setenv GXX_INCLUDE_PATH "h:/mingw/include/c++/3.3.1"
149	setenv COMMON_BUILD_TOOLS "$SRC_ROOT/external/common"	149	setenv COMMON_BUILD_TOOLS "$SRC_ROOT/external/common"
150	setenv SOLARSRC "d:\\work\\ooo_1.1rc4_src"	150	setenv SOLARSRC "d:\\work\\ooo_1.1rc4_src"
151	setenv LIB ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\lib;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\lib;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\lib;h:\\j2sdk1.4.1_03\\lib;h:\\SDK\\lib"	151	setenv LIB ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\lib;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\lib;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\lib;h:\\j2sdk1.4.1_03\\lib;h:\\mingw\\lib"
152	setenv IENV ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32"	152	setenv IENV ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\mingw\\include;h:\\mingw\\lib\\gcc-lib\\mingw32\\3.3.1\\include;h:\\mingw\\include\\c++\\3.3.1;h:\\mingw\\include\\c++\\3.3.1\\mingw32;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32"
153	setenv ILIB ".;.;d:\\work\\ooo_1.1rc4_src\\solver\\645\\lib;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\lib;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\lib;h:\\j2sdk1.4.1_03\\lib;h:\\SDK\\lib"	153	setenv ILIB ".;.;d:/work/ooo_1.1rc4_src/solver/645/lib;d:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/lib;d:/work/ooo_1.1rc4_src/solenv/wntgcci/lib;h:/j2sdk1.4.1_03/lib;h:/mingw/lib"
154	setenv INCLUDE ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32"	154	setenv INCLUDE ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\mingw\\include;h:\\mingw\\lib\\gcc-lib\\mingw32\\3.3.1\\include;h:\\mingw\\include\\c++\\3.3.1;h:\\mingw\\include\\c++\\3.3.1\\mingw32;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32"
155	setenv GREP "$CYGWIN/grep.exe"	155	setenv GREP "$CYGWIN/grep.exe"
156	setenv FIND "$CYGWIN/find.exe"	156	setenv FIND "$CYGWIN/find.exe"
157	setenv LS "$CYGWIN/ls.exe"	157	setenv LS "$CYGWIN/ls.exe"