From c1cfe0f0683d37f73e1c1a547e1defe373926411 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 1 Oct 2008 07:05:18 +0000 Subject: CWS-TOOLING: integrate CWS mingwport15 --- sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp | 8 ++++++-- sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp | 8 ++++++-- sal/systools/win32/uwinapi/ResolveUnicows.cpp | 4 ++-- sal/systools/win32/uwinapi/makefile.mk | 6 +++++- 4 files changed, 19 insertions(+), 7 deletions(-) (limited to 'sal/systools') diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp index 2aa99e317367..4f48be335855 100644 --- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp +++ b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FindFirstVolumeMountPointA.cpp,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.38.2 $ * * This file is part of OpenOffice.org. * @@ -28,7 +28,11 @@ * ************************************************************************/ #include "macros.h" +#ifdef __MINGW32__ +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointA, (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) +#else DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointA, (LPCSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) +#endif /* extern "C" _declspec( dllexport ) FARPROC kernel32_FindFirstVolumeMountPointA_Ptr; static HANDLE __stdcall FindFirstVolumeMountPointA_Failure (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength); @@ -47,4 +51,4 @@ extern "C" _declspec( naked ) HANDLE __stdcall FindFirstVolumeMountPointA (LPCST extern "C" _declspec( dllexport ) FARPROC kernel32_FindFirstVolumeMountPointA_Ptr = (FARPROC)FindFirstVolumeMountPointA_Thunk; static HANDLE __stdcall FindFirstVolumeMountPointA_Failure (LPSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) { SetLastError( 120L ); return (HANDLE)0; } -*/ \ No newline at end of file +*/ diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp index 379bbfdcff66..b8768942bd1d 100644 --- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp +++ b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FindFirstVolumeMountPointW.cpp,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.38.2 $ * * This file is part of OpenOffice.org. * @@ -28,4 +28,8 @@ * ************************************************************************/ #include "macros.h" -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointW, (LPCWSTR lpszRootPathName, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) \ No newline at end of file +#ifdef __MINGW32__ +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointW, (LPWSTR lpszRootPathName, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) +#else +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeMountPointW, (LPCWSTR lpszRootPathName, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) ) +#endif diff --git a/sal/systools/win32/uwinapi/ResolveUnicows.cpp b/sal/systools/win32/uwinapi/ResolveUnicows.cpp index 06b4999c1ce5..cd5943004f17 100644 --- a/sal/systools/win32/uwinapi/ResolveUnicows.cpp +++ b/sal/systools/win32/uwinapi/ResolveUnicows.cpp @@ -273,7 +273,7 @@ DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeExW, (LCID,DWORD,LPCW DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeW, (DWORD,LPCWSTR,int,LPWORD) ) DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemDirectoryW, (LPWSTR,UINT) ) DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemWindowsDirectoryW, (LPWSTR,UINT) ) -DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetTabbedTextExtentW, (HDC,LPCWSTR,int,int,LPINT) ) +DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetTabbedTextExtentW, (HDC,LPCWSTR,int,int,CONST INT*) ) DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetTempFileNameW, (LPCWSTR,LPCWSTR,UINT,LPWSTR) ) DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetTempPathW, (DWORD,LPWSTR) ) DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentExPointW, ( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE ) ) @@ -452,7 +452,7 @@ DEFINE_UNICOWS_THUNK( shell32, BOOL, WINAPI, Shell_NotifyIconW, (DWORD,PNOTIFYIC DEFINE_UNICOWS_THUNK( winspool, DWORD, WINAPI, StartDocPrinterW, (HANDLE,DWORD,PBYTE) ) DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, StartDocW, (HDC,const DOCINFOW*) ) DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SystemParametersInfoW, (UINT,UINT,PVOID,UINT) ) -DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, TabbedTextOutW, (HDC,int,int,LPCWSTR,int,int,LPINT,int) ) +DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, TabbedTextOutW, (HDC,int,int,LPCWSTR,int,int,CONST INT*,int) ) DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, TextOutW, (HDC,int,int,LPCWSTR,int) ) DEFINE_UNICOWS_THUNK( user32, int, WINAPI, TranslateAcceleratorW, (HWND,HACCEL,LPMSG) ) DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, UnregisterClassW, (LPCWSTR,HINSTANCE) ) diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk index b424f7dc5e79..1e6c419a0c92 100644 --- a/sal/systools/win32/uwinapi/makefile.mk +++ b/sal/systools/win32/uwinapi/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.17.38.1 $ # # This file is part of OpenOffice.org. # @@ -47,6 +47,10 @@ CXXFLAGS+= $(LFS_CFLAGS) .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +CDEFS+=-UWINVER -DWINVER=0x0500 +CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type +.ENDIF .IF "$(COMEX)"=="9" .IF "$(PSDK_HOME)"!="" -- cgit