[Libreoffice-commits] .: sal/inc sal/systools
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jun 17 06:48:24 PDT 2011
sal/inc/systools/win32/AutoSystoolInit.hxx | 65 -
sal/inc/systools/win32/StrConvert.h | 135 --
sal/inc/systools/win32/SyncObjects.hxx | 113 --
sal/inc/systools/win32/uwinapi.h | 52
sal/systools/win32/uwinapi/CheckTokenMembership.cpp | 37
sal/systools/win32/uwinapi/CommandLineToArgvW.cpp | 174 ---
sal/systools/win32/uwinapi/CopyFileExA.cpp | 169 ---
sal/systools/win32/uwinapi/CopyFileExW.cpp | 42
sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp | 35
sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp | 35
sal/systools/win32/uwinapi/DllGetVersion.cpp | 76 -
sal/systools/win32/uwinapi/DllMain.cpp | 238 ----
sal/systools/win32/uwinapi/DrawStateW.cpp | 77 -
sal/systools/win32/uwinapi/EnumProcesses.cpp | 43
sal/systools/win32/uwinapi/FindFirstVolumeA.cpp | 32
sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp | 54
sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp | 35
sal/systools/win32/uwinapi/FindFirstVolumeW.cpp | 32
sal/systools/win32/uwinapi/FindNextVolumeA.cpp | 32
sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp | 32
sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp | 32
sal/systools/win32/uwinapi/FindNextVolumeW.cpp | 32
sal/systools/win32/uwinapi/FindVolumeClose.cpp | 32
sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp | 32
sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp | 61 -
sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp | 43
sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp | 43
sal/systools/win32/uwinapi/GetLongPathName.cpp | 115 --
sal/systools/win32/uwinapi/GetLongPathNameA.cpp | 33
sal/systools/win32/uwinapi/GetLongPathNameW.cpp | 66 -
sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp | 55 -
sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp | 20
sal/systools/win32/uwinapi/GetProcessId.cpp | 167 ---
sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp | 36
sal/systools/win32/uwinapi/GetUserDomainA.cpp | 48
sal/systools/win32/uwinapi/GetUserDomainW.cpp | 49
sal/systools/win32/uwinapi/GetUserDomain_NT.cpp | 33
sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp | 82 -
sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp | 32
sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp | 32
sal/systools/win32/uwinapi/GetVolumePathNameA.cpp | 32
sal/systools/win32/uwinapi/GetVolumePathNameW.cpp | 32
sal/systools/win32/uwinapi/MCIWndCreateW.cpp | 44
sal/systools/win32/uwinapi/MoveFileExA.cpp | 100 -
sal/systools/win32/uwinapi/MoveFileExW.cpp | 40
sal/systools/win32/uwinapi/PathAddBackslashW.cpp | 45
sal/systools/win32/uwinapi/PathCompactPathExW.cpp | 48
sal/systools/win32/uwinapi/PathFileExistsW.cpp | 43
sal/systools/win32/uwinapi/PathFindExtensionW.cpp | 55 -
sal/systools/win32/uwinapi/PathFindFileNameW.cpp | 54
sal/systools/win32/uwinapi/PathIsFileSpecW.cpp | 43
sal/systools/win32/uwinapi/PathIsUNCW.cpp | 43
sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp | 44
sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp | 45
sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp | 45
sal/systools/win32/uwinapi/PathStripToRootW.cpp | 45
sal/systools/win32/uwinapi/ResolveThunk.cpp | 66 -
sal/systools/win32/uwinapi/ResolveUnicows.cpp | 518 ---------
sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp | 35
sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp | 35
sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp | 32
sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp | 32
sal/systools/win32/uwinapi/Uwinapi.def | 22
sal/systools/win32/uwinapi/Uwinapi.h | 134 --
sal/systools/win32/uwinapi/macros.h | 235 ----
sal/systools/win32/uwinapi/makefile.mk | 64 -
sal/systools/win32/uwinapi/toolhelp.cpp | 60 -
sal/systools/win32/uwinapi/unicows.dxp | 546 ----------
sal/systools/win32/uwinapi/unicows_mingw.dxp | 544 ---------
sal/systools/win32/uwinapi/uwinapi.dxp | 86 -
sal/systools/win32/uwinapi/uwinapi_mingw.dxp | 90 -
sal/systools/win32/uwinapi/win95sys.h | 350 ------
72 files changed, 1 insertion(+), 6157 deletions(-)
New commits:
commit c134c4553a4c2971b3c05c79f4ca11f923ac2f5f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 17 16:43:19 2011 +0300
Clean out cruft from systools and especially uwinapi
diff --git a/sal/inc/systools/win32/AutoSystoolInit.hxx b/sal/inc/systools/win32/AutoSystoolInit.hxx
deleted file mode 100644
index cb22bd5..0000000
--- a/sal/inc/systools/win32/AutoSystoolInit.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _AUTOSYSTOOLINIT_HXX_
-#define _AUTOSYSTOOLINIT_HXX_
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-//------------------------------------------------------------------------
-// class used to automatically initialize/deinitialize the systools
-//------------------------------------------------------------------------
-
-class OAutoSystoolInit
-{
- typedef void ( WINAPI *LPFNINIT_T )( );
- typedef void ( WINAPI *LPFNDEINIT_T )( );
-
-public:
- OAutoSystoolInit( LPFNINIT_T lpfnInit, LPFNDEINIT_T lpfnDeInit ) :
- m_lpfnDeInit( lpfnDeInit )
- {
- if ( NULL != lpfnInit )
- lpfnInit( );
- }
-
- ~OAutoSystoolInit( )
- {
- if ( NULL != m_lpfnDeInit )
- m_lpfnDeInit( );
- }
-
-private:
- LPFNDEINIT_T m_lpfnDeInit; // address of the deinit function
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/StrConvert.h b/sal/inc/systools/win32/StrConvert.h
deleted file mode 100644
index 25ebec0..0000000
--- a/sal/inc/systools/win32/StrConvert.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _STRCONVERT_H_
-#define _STRCONVERT_H_
-
-#include <windows.h>
-
-#ifdef NDEBUG
-#define STRCONVERT_H_HAD_NDEBUG
-#undef NDEBUG
-#endif
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-int AllocNecessarySpaceAndCopyWStr2Str( LPCWSTR lpcwstrString, LPSTR* lppStr );
-int AllocSpaceAndCopyWStr2Str( LPCWSTR lpcwstrString, DWORD nWCharsToCopy, LPSTR* lppStr );
-int CalcLenDblNullTerminatedWStr( LPCWSTR lpcwstrString );
-int CalcLenDblNullTerminatedStr( LPCSTR lpcstrString );
-void FreeSpaceStr( LPSTR lpszString );
-
-/* WC2MB allocates a sufficient amount of memory on stack and converts
- the wide char parameter to multi byte string using the actual code
- page.
-
- @Param: wcStr - a wide char string
- mbStr - the corresponding multi byte string
-
- NOTE: due to the use of _alloca, this must be a macro and no function
-*/
-
-#define WC2MB( wcStr, mbStr ) \
-if( wcStr ) \
-{ \
- int needed = WideCharToMultiByte( CP_ACP, 0, wcStr, -1, NULL, 0, NULL, NULL ); \
- if( needed > 0 ) \
- { \
- int copied; \
- mbStr = _alloca( needed * sizeof( CHAR ) ); \
- copied = WideCharToMultiByte( CP_ACP, 0, wcStr, -1, mbStr, needed, NULL, NULL ); \
- assert( copied == needed ); \
- } \
-}
-
-
-/* WideCharListGetMultiByteLength
- calculates the needed length of a corresponding the multi byte string
- list for a wide char string list.
-
- @Param: cp - the code page to use for convertion.
- wcList - a double '\0' terminated wide char string list.
-*/
-
-int WideCharListGetMultiByteLength( UINT codepage, LPCWSTR wcList );
-
-/* WideCharListToMultiByteList
- converts a double '\0' terminated list of wide char strings to a
- multi byte string list.
-
- @Param: cp - the code page to use for convertion.
- wcList - a double '\0' terminated wide char string list.
- mbList - a double '\0' terminated multi byte string list.
- dwSize - size of buffer for multi byte string list.
-*/
-
-int WideCharListToMultiByteList( UINT codepage, LPCWSTR wcList, LPSTR mbList, DWORD dwSize );
-
-
-/* WCL2MBL allocates a sufficient amount of memory on stack and converts
- the wide char list parameter to multi byte string list using the actual
- code page.
-
- @Param: wcList - a wide char string list
- mbList - the corresponding multi byte string list
-
- NOTE: due to the use of _alloca, this must be a macro and no function
-*/
-
-#define WCL2MBL( wcList, mbList ) \
-if( wcList ) \
-{ \
- int needed = WideCharListGetMultiByteLength( CP_ACP, wcList ); \
- if( needed > 0 ) \
- { \
- int copied; \
- mbList = _alloca( needed * sizeof( CHAR ) ); \
- copied = WideCharListToMultiByteList( CP_ACP, wcList, mbList, needed ); \
- assert( copied == needed ); \
- } \
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-// Restore NDEBUG state
-#ifdef STRCONVERT_H_HAD_NDEBUG
-#define NDEBUG
-#else
-#undef NDEBUG
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/SyncObjects.hxx b/sal/inc/systools/win32/SyncObjects.hxx
deleted file mode 100644
index 2733215..0000000
--- a/sal/inc/systools/win32/SyncObjects.hxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef _SYNCOBJECTS_HXX_
-#define _SYNCOBJECTS_HXX_
-
-//------------------------------------------------------------------------
-// includes
-//------------------------------------------------------------------------
-
-#include <windows.h>
-
-//------------------------------------------------------------------------
-// a simple helper template for automatic locking/unlocking
-//------------------------------------------------------------------------
-
-template< class LOCK >
-class CLockGuard
-{
-public:
- CLockGuard( LOCK* aLock ) :
- m_pLock( aLock )
- {
- m_pLock->Lock( );
- }
-
- ~CLockGuard( )
- {
- m_pLock->Unlock( );
- }
-
-private:
- LOCK* m_pLock;
-};
-
-//------------------------------------------------------------------------
-// a interface base class for different locking sub classes
-//------------------------------------------------------------------------
-
-class CSyncObject
-{
-public:
- virtual ~CSyncObject( ) = 0;
-
- virtual int Lock( ) = 0;
- virtual int Unlock( ) = 0;
-};
-
-//------------------------------------------------------------------------
-// if no synchronization is necessary this class will be used
-// declaring the functions as inline safes runtime overhead
-//------------------------------------------------------------------------
-
-class CNullLock
-{
-public:
- inline virtual ~CNullLock ( ) {};
- inline virtual int Lock( ) {};
- inline virtual int Unlock() {};
-};
-
-//------------------------------------------------------------------------
-// a minimal wrapper for a win32 critical section
-//------------------------------------------------------------------------
-
-class CCriticalSection : public CSyncObject
-{
-public:
- CCriticalSection( );
- virtual ~CCriticalSection( );
-
- // both functions return always 0
- // because the win32 critsec functions
- // don't return any return code
- virtual int Lock( );
- virtual int Unlock( );
-
-private:
- CRITICAL_SECTION m_critSec;
-};
-
-
-typedef CLockGuard< CSyncObject > SyncObjLockGuard_t;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/uwinapi.h b/sal/inc/systools/win32/uwinapi.h
index a9e6a9f..6c7e763 100644
--- a/sal/inc/systools/win32/uwinapi.h
+++ b/sal/inc/systools/win32/uwinapi.h
@@ -51,58 +51,6 @@
#endif
#endif
-/** GetUserDomain
-
-The GetUserDomain function retrieves the name of the NT domain the user is
-logged in.
-
-Parameters
- @param lpBuffer
- [out] Pointer to a buffer that receives a null-terminated string
- containing the domain name.
- @param nBufferSize
- [in] Specifies the size, in TCHARs, of the buffer pointed to
- by the lpBuffer parameter.
-
-
-Return Values
- @return
- If the function succeeds, the return value is the number of TCHARs stored
- into the buffer pointed to by lpBuffer, not including the terminating
- null character.
-
- If the domain name can't be retrieved, the return value is zero.
-
- If the buffer pointed to by lpBuffer is not large enough, the return value
- is the buffer size, in TCHARs, required to hold the value string and its
- terminating null character.
-
-Remarks
- Windows 95/98/Me: If the user is not logged in onto a NT domain server
- the name of the workgroup is returned.
-
-Requirements
- Windows NT/2000/XP: Included in Windows NT 4 and later.
- Windows 95/98/Me: Included in Windows 95 and later.
- Header: Declared in Uwinapi.h; include Uwinapi.h.
- Library: Use Uwinapi.lib.
- Unicode: Implemented as Unicode and ANSI versions on Windows 95/98/Me/NT/2000/XP.
-
-See Also
- at see
-*/
-
-EXTERN_C WINBASEAPI DWORD WINAPI GetUserDomainA( LPSTR lpBuffer, DWORD nBuffserSize );
-EXTERN_C WINBASEAPI DWORD WINAPI GetUserDomainW( LPWSTR lpBuffer, DWORD nBuffserSize );
-
-#ifdef UNICODE
-#define GetUserDomain GetUserDomainW
-#else
-#define GetUserDomain GetUserDomainA
-#endif
-
-EXTERN_C WINBASEAPI DWORD WINAPI GetProcessId( HANDLE hProcess );
-
#ifdef __cplusplus
inline bool IsValidHandle(HANDLE handle)
diff --git a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp b/sal/systools/win32/uwinapi/CheckTokenMembership.cpp
deleted file mode 100644
index e94dfd5..0000000
--- a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#if defined(_MSC_VER) && (_MSC_VER>=1400)
-#pragma warning(disable : 4273)
-#endif
-#include "macros.h"
-
-
-DEFINE_DEFAULT_THUNK( advapi32, TRYLOAD, BOOL, WINAPI, CheckTokenMembership, (HANDLE TokenHandle, PSID SidToCheck, PBOOL IsMember) )
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp b/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
deleted file mode 100644
index 958206a..0000000
--- a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
-#endif
-
-#include "macros.h"
-
-#ifdef __cplusplus
-#define local inline
-#else
-#define local static
-#endif
-
-local LPCWSTR SkipBlanks( LPCWSTR lpScan )
-{
- while ( ' ' == *lpScan || '\t' == *lpScan )
- lpScan++;
-
- return lpScan;
-}
-
-
-local LPCWSTR SkipArgument( LPCWSTR lpScan )
-{
- BOOL fQuoted = FALSE;
- LPCWSTR lpArgEnd = NULL;
-
- do
- {
- switch ( *lpScan )
- {
- case ' ':
- case '\t':
- if ( fQuoted )
- lpScan++;
- else
- lpArgEnd = lpScan;
- break;
- case '\"':
- lpScan++;
- fQuoted = !fQuoted;
- break;
- case '\0':
- lpArgEnd = lpScan;
- break;
- default:
- lpScan++;
- break;
- }
- } while( *lpScan && !lpArgEnd );
-
- return lpScan;
-}
-
-
-IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWSTR lpCmdLineW, int *pNumArgs ) )
-{
- LPWSTR *lpArgvW = NULL;
-
- if ( !lpCmdLineW || !*lpCmdLineW )
- {
- CHAR szFileName[MAX_PATH];
-
- DWORD dwResult = GetModuleFileNameA( NULL, szFileName, MAX_PATH );
-
- if ( dwResult && dwResult < MAX_PATH )
- {
- int cchNeeded = MultiByteToWideChar( CP_ACP, 0, szFileName, -1, NULL, 0 );
-
- lpArgvW = (LPWSTR *)GlobalAlloc( 0, cchNeeded * sizeof(WCHAR) + sizeof(LPWSTR) );
-
- if ( lpArgvW )
- {
- lpArgvW[0] = (LPWSTR)(lpArgvW + 1);
-
- MultiByteToWideChar( CP_ACP, 0, szFileName, -1, lpArgvW[0], cchNeeded );
- *pNumArgs = 1;
- }
- else
- SetLastError( ERROR_OUTOFMEMORY );
- }
- }
- else
- {
- LPCWSTR lpScan = lpCmdLineW;
- int nTokens = 0;
- int cchNeeded = 0;
-
- // Count arguments and required size
-
- while ( *lpScan )
- {
- lpScan = SkipBlanks( lpScan );
- if ( *lpScan )
- {
- LPCWSTR lpArgEnd = SkipArgument( lpScan );
-
- nTokens++;
- cchNeeded += lpArgEnd - lpScan + 1;
- lpScan = lpArgEnd;
- }
- }
-
- // Allocate space for one additional NULL pointer to terminate list
-
- lpArgvW = (LPWSTR *)GlobalAlloc( 0, sizeof(LPWSTR) * (nTokens + 1) + sizeof(WCHAR) * cchNeeded );
-
- if ( lpArgvW )
- {
- // Collect arguments
-
- LPWSTR lpDestination = (LPWSTR)&lpArgvW[nTokens + 1];
-
- lpScan = lpCmdLineW;
- nTokens = 0;
-
- while ( *lpScan )
- {
- lpScan = SkipBlanks( lpScan );
- if ( *lpScan )
- {
- LPCWSTR lpArgEnd = SkipArgument( lpScan );
-
- lpArgvW[nTokens++] = lpDestination;
-
- while ( lpScan < lpArgEnd )
- {
- if ( '\"' != *lpScan )
- *lpDestination++ = *lpScan;
-
- lpScan++;
- }
- *lpDestination++ = 0;
- }
- }
-
- lpArgvW[nTokens] = NULL;
-
- *pNumArgs = nTokens;
- }
- else
- SetLastError( ERROR_OUTOFMEMORY );
-
- }
-
- return lpArgvW;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/CopyFileExA.cpp b/sal/systools/win32/uwinapi/CopyFileExA.cpp
deleted file mode 100644
index fafc73a..0000000
--- a/sal/systools/win32/uwinapi/CopyFileExA.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
-#endif
-
-#define _WIN32_WINNT 0x0400
-#include "macros.h"
-
-#define BUFSIZE 16384
-
-static DWORD CALLBACK DefCopyProgressRoutine(
- LARGE_INTEGER TotalFileSize, // total file size, in bytes
- LARGE_INTEGER TotalBytesTransferred,
- // total number of bytes transferred
- LARGE_INTEGER StreamSize, // total number of bytes for this stream
- LARGE_INTEGER StreamBytesTransferred,
- // total number of bytes transferred for
- // this stream
- DWORD dwStreamNumber, // the current stream
- DWORD dwCallbackReason, // reason for callback
- HANDLE hSourceFile, // handle to the source file
- HANDLE hDestinationFile, // handle to the destination file
- LPVOID lpData // passed by CopyFileEx
-)
-{
- return PROGRESS_CONTINUE;
-}
-
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExA, ( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, LPPROGRESS_ROUTINE lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags ) )
-{
- BOOL fSuccess = FALSE; // Assume failure
-
- HANDLE hSourceFile = CreateFileA(
- lpExistingFileNameA,
- GENERIC_READ,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL,
- OPEN_EXISTING,
- 0,
- NULL
- );
-
- if ( IsValidHandle(hSourceFile) )
- {
- LARGE_INTEGER FileSize, BytesTransferred;
- HANDLE hTargetFile = NULL;
-
- SetLastError( ERROR_SUCCESS );
- FileSize.LowPart = GetFileSize( hSourceFile, (LPDWORD)&FileSize.HighPart );
- BytesTransferred.QuadPart = 0;
-
- if ( (DWORD)-1 != FileSize.LowPart || ERROR_SUCCESS == GetLastError() )
- hTargetFile = CreateFileA(
- lpNewFileNameA,
- GENERIC_WRITE,
- 0,
- NULL,
- (DWORD) ((dwCopyFlags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS),
- 0,
- NULL
- );
-
- if ( IsValidHandle(hTargetFile) )
- {
- DWORD dwProgressResult = PROGRESS_CONTINUE;
-
- fSuccess = SetEndOfFile( hTargetFile );
-
- if ( fSuccess )
- {
- if ( !lpProgressRoutine )
- lpProgressRoutine = DefCopyProgressRoutine;
-
- dwProgressResult = lpProgressRoutine(
- FileSize,
- BytesTransferred,
- FileSize,
- BytesTransferred,
- 1,
- CALLBACK_STREAM_SWITCH,
- hSourceFile,
- hTargetFile,
- lpData
- );
-
- // Suppress further notifications
-
- if ( PROGRESS_QUIET == dwProgressResult )
- {
- lpProgressRoutine = DefCopyProgressRoutine;
- dwProgressResult = PROGRESS_CONTINUE;
- }
- }
-
- while ( fSuccess && PROGRESS_CONTINUE == dwProgressResult )
- {
- BYTE buffer[BUFSIZE];
- DWORD dwBytesRead, dwBytesWritten = 0;
-
- fSuccess = ReadFile( hSourceFile, buffer, BUFSIZE, &dwBytesRead, NULL );
-
- if ( !dwBytesRead ) break;
-
- if ( fSuccess )
- fSuccess = WriteFile( hTargetFile, buffer, dwBytesRead, &dwBytesWritten, NULL );
-
- if ( fSuccess )
- {
- BytesTransferred.QuadPart += (LONGLONG)dwBytesWritten;
-
- if ( pbCancel && *pbCancel )
- dwProgressResult = PROGRESS_CANCEL;
- else
- dwProgressResult = lpProgressRoutine(
- FileSize,
- BytesTransferred,
- FileSize,
- BytesTransferred,
- 1,
- CALLBACK_CHUNK_FINISHED,
- hSourceFile,
- hTargetFile,
- lpData
- );
-
- }
-
- }
-
- CloseHandle( hTargetFile );
-
- if ( PROGRESS_CANCEL == dwProgressResult )
- DeleteFileA( lpNewFileNameA );
- }
-
-
- CloseHandle( hSourceFile );
- }
-
- return fSuccess;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/CopyFileExW.cpp b/sal/systools/win32/uwinapi/CopyFileExW.cpp
deleted file mode 100644
index 9ba56f6..0000000
--- a/sal/systools/win32/uwinapi/CopyFileExW.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
-#endif
-
-#define _WIN32_WINNT 0x0400
-#include "macros.h"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExW, ( LPCWSTR lpExistingFileNameW, LPCWSTR lpNewFileNameW, LPPROGRESS_ROUTINE lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags ) )
-{
- AUTO_WSTR2STR( lpExistingFileName );
- AUTO_WSTR2STR( lpNewFileName );
-
- return CopyFileExA( lpExistingFileNameA, lpNewFileNameA, lpProgressRoutine, lpData, pbCancel, dwCopyFlags );
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp
deleted file mode 100644
index ee81b38..0000000
--- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
-#endif
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointA, (LPCSTR lpszVolumeMountPoint) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp
deleted file mode 100644
index 739c5f4..0000000
--- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4740)
-#endif
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, DeleteVolumeMountPointW, (LPCWSTR lpszVolumeMountPoint) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DllGetVersion.cpp b/sal/systools/win32/uwinapi/DllGetVersion.cpp
deleted file mode 100644
index 7f3e4f1..0000000
--- a/sal/systools/win32/uwinapi/DllGetVersion.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define WIN32_LEAN_AND_MEAN
-#ifdef _MSC_VER
-#pragma warning(push,1)
-#endif
-#include <windows.h>
-#include <shlwapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#include <malloc.h>
-
-extern HMODULE UWINAPI_BaseAddress;
-
-// This function should be exported by every DLL that wants to provide it's version number.
-// This code automaticly generates the information from the version resource
-
-extern "C" HRESULT CALLBACK DllGetVersion( DLLVERSIONINFO *pdvi )
-{
- TCHAR szModulePath[MAX_PATH];
- BOOL fSuccess = FALSE;
-
- if ( UWINAPI_BaseAddress && GetModuleFileName( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) )
- {
- DWORD dwHandle = 0;
- DWORD dwSize = GetFileVersionInfoSize( szModulePath, &dwHandle );
- LPVOID lpData = _alloca( dwSize );
-
- if ( GetFileVersionInfo( szModulePath, dwHandle, dwSize, lpData ) )
- {
- VS_FIXEDFILEINFO *lpBuffer = NULL;
- UINT uLen = 0;
-
- if ( VerQueryValue( lpData, TEXT("\\"), (LPVOID *)&lpBuffer, &uLen ) )
- {
- pdvi->dwMajorVersion = HIWORD( lpBuffer->dwFileVersionMS );
- pdvi->dwMinorVersion = LOWORD( lpBuffer->dwFileVersionMS );
- pdvi->dwBuildNumber = HIWORD( lpBuffer->dwFileVersionLS );
- pdvi->dwPlatformID = (DWORD) ((lpBuffer->dwFileOS & VOS_NT) ? DLLVER_PLATFORM_NT : DLLVER_PLATFORM_WINDOWS);
-
- fSuccess = TRUE;
- }
- }
- }
-
- return fSuccess ? HRESULT_FROM_WIN32( GetLastError() ) : HRESULT_FROM_WIN32( NO_ERROR );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DllMain.cpp b/sal/systools/win32/uwinapi/DllMain.cpp
deleted file mode 100644
index 25be14e..0000000
--- a/sal/systools/win32/uwinapi/DllMain.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define WIN32_LEAN_AND_MEAN
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
-#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#include <malloc.h>
-#define _MBCS
-#include <tchar.h>
-
-
-HMODULE UWINAPI_BaseAddress = NULL;
-const CHAR szUnicowsModuleName[] = "UNICOWS.DLL";
-
-static HMODULE WINAPI _LoadUnicowsLibrary(VOID)
-{
- CHAR szModulePath[MAX_PATH];
- HMODULE hModuleUnicows = NULL;
-
- // First search in the same directory as UWINAPI.DLL was loaded from. This is because
- // UWINAPI.DLL not always resides in the same directory as the actual application.
-
- if ( UWINAPI_BaseAddress && GetModuleFileNameA( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) )
- {
- char *lpLastBkSlash = _tcsrchr( szModulePath, '\\' );
-
- if ( lpLastBkSlash )
- {
- size_t nParentDirSize = (size_t) (_tcsinc( lpLastBkSlash ) - szModulePath);
- LPSTR lpUnicowsModulePath = (LPTSTR)_alloca( nParentDirSize + sizeof(szUnicowsModuleName) );
-
- if ( lpUnicowsModulePath )
- {
- _tcsncpy( lpUnicowsModulePath, szModulePath, nParentDirSize );
- _tcscpy( lpUnicowsModulePath + nParentDirSize, szUnicowsModuleName );
-
- hModuleUnicows = LoadLibraryA( lpUnicowsModulePath );
- }
- }
- }
-
- // Search at the common places
-
- if ( !hModuleUnicows )
- hModuleUnicows = LoadLibraryA(szUnicowsModuleName);
-
- return hModuleUnicows;
-}
-
-static HMODULE WINAPI LoadUnicowsLibrary(VOID)
-{
- HMODULE hModuleUnicows;
- int idMsg = IDOK;
-
- do
- {
- hModuleUnicows = _LoadUnicowsLibrary();
-
- if ( !hModuleUnicows )
- {
- LPVOID lpMsgBuf;
-
- FormatMessageA(
- FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL,
- ERROR_DLL_NOT_FOUND /* GetLastError() */,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
- (LPSTR)&lpMsgBuf,
- 0,
- NULL
- );
- // Process any inserts in lpMsgBuf.
- CHAR szModuleFileName[MAX_PATH];
-
- GetModuleFileNameA( NULL, szModuleFileName, sizeof(szModuleFileName) );
- LPSTR lpMessage = (LPSTR)_alloca( strlen( (LPCSTR)lpMsgBuf ) + sizeof(szUnicowsModuleName) + 1 );
- strcpy( lpMessage, (LPCSTR)lpMsgBuf );
- strcat( lpMessage, "\n" );
- strcat( lpMessage, szUnicowsModuleName );
- // Free the buffer.
- LocalFree( lpMsgBuf );
- // Display the string.
- idMsg = MessageBoxA( NULL, lpMessage,
- szModuleFileName, MB_ABORTRETRYIGNORE | MB_ICONERROR | MB_TASKMODAL );
-
- if ( IDABORT == idMsg )
- TerminateProcess( GetCurrentProcess(), 255 );
- }
- } while ( !hModuleUnicows && IDRETRY == idMsg );
-
- return hModuleUnicows;
-}
-
-extern "C" {
-FARPROC _PfnLoadUnicows = (FARPROC)LoadUnicowsLibrary;
-}
-
-#ifdef __MINGW32__
-
-extern "C" {
-
-typedef void (*func_ptr) (void);
-extern func_ptr __CTOR_LIST__[];
-extern func_ptr __DTOR_LIST__[];
-
-static void do_startup(void);
-static void do_cleanup(void);
-
-HMODULE hModuleUnicowsDLL;
-
-void
-__do_global_dtors (void)
-{
- static func_ptr *p = __DTOR_LIST__ + 1;
-
- /*
- * Call each destructor in the destructor list until a null pointer
- * is encountered.
- */
- while (*p)
- {
- (*(p)) ();
- p++;
- }
-}
-
-void
-__do_global_ctors (void)
-{
- unsigned long nptrs = (unsigned long) __CTOR_LIST__[0];
- unsigned i;
-
- /*
- * If the first entry in the constructor list is -1 then the list
- * is terminated with a null entry. Otherwise the first entry was
- * the number of pointers in the list.
- */
- if (nptrs == static_cast<unsigned long>(-1))
- {
- for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++)
- ;
- }
-
- /*
- * Go through the list backwards calling constructors.
- */
- for (i = nptrs; i >= 1; i--)
- {
- __CTOR_LIST__[i] ();
- }
-
- /*
- * Register the destructors for processing on exit.
- */
- atexit (__do_global_dtors);
-}
-
-static int initialized = 0;
-
-void
-__main (void)
-{
- if (!initialized)
- {
- initialized = 1;
- do_startup();
- __do_global_ctors ();
- }
-}
-
-static void do_startup( void )
-{
- if (((LONG)GetVersion()&0x800000ff) == 0x80000004)
- {
- hModuleUnicowsDLL = LoadUnicowsLibrary();
- if (hModuleUnicowsDLL)
- atexit(do_cleanup);
- }
-}
-
-void do_cleanup( void )
-{
- FreeLibrary(hModuleUnicowsDLL);
-}
-}
-
-#endif
-
-extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID )
-{
- switch ( dwReason )
- {
- case DLL_PROCESS_ATTACH:
- UWINAPI_BaseAddress = hModule;
-#ifdef __MINGW32__
- return TRUE;
-#else
- return DisableThreadLibraryCalls( hModule );
-#endif
- default:
- return TRUE;
- }
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/DrawStateW.cpp b/sal/systools/win32/uwinapi/DrawStateW.cpp
deleted file mode 100644
index 89003c4..0000000
--- a/sal/systools/win32/uwinapi/DrawStateW.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( user32, WINDOWS, BOOL, WINAPI, DrawStateW,
-(
- HDC hdc, // handle to device context
- HBRUSH hbr, // handle to brush
- DRAWSTATEPROC lpOutputFunc, // pointer to callback function
- LPARAM lData, // image information
- WPARAM wData, // more image information
- int x, // horizontal location of image
- int y, // vertical location of image
- int cx, // width of image
- int cy, // height of image
- UINT fuFlags // image type and state
-
-))
-{
- switch ( fuFlags & 0x000F )
- {
- case DST_TEXT:
- case DST_PREFIXTEXT:
- {
- LPSTR lpTextA = NULL;
-
- if ( lData )
- {
- int cchWideChar = (int) (wData ? wData : -1);
- int cchNeeded = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lData, cchWideChar, NULL, 0, NULL, NULL );
-
- lpTextA = (LPSTR)_alloca( cchNeeded * sizeof(CHAR) );
-
- if ( !lpTextA )
- {
- SetLastError( ERROR_OUTOFMEMORY );
- return FALSE;
- }
-
- WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lData, cchWideChar, lpTextA, cchNeeded, NULL, NULL );
-
- }
-
- return DrawStateA( hdc, hbr, lpOutputFunc, (LPARAM)lpTextA, wData, x, y, cx, cy, fuFlags );
- }
- default:
- return DrawStateA( hdc, hbr, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags );
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/EnumProcesses.cpp b/sal/systools/win32/uwinapi/EnumProcesses.cpp
deleted file mode 100644
index a8b5fab..0000000
--- a/sal/systools/win32/uwinapi/EnumProcesses.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "macros.h"
-#include <tlhelp32.h>
-
-IMPLEMENT_THUNK( psapi, WINDOWS, BOOL, WINAPI, EnumProcesses, ( LPDWORD lpProcesses, DWORD cbSize, LPDWORD lpcbCopied ) )
-{
- BOOL fSuccess = FALSE;
- HANDLE hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
-
- if ( IsValidHandle( hSnapshot ) )
- {
- PROCESSENTRY32 pe;
-
- if ( lpcbCopied )
- *lpcbCopied = 0;
-
- pe.dwSize = sizeof(pe);
- if ( Process32First( hSnapshot, &pe ) )
- {
- fSuccess = TRUE;
-
- while ( cbSize >= sizeof(*lpProcesses) )
- {
- *(lpProcesses++) = pe.th32ProcessID;
- if ( lpcbCopied )
- *lpcbCopied += sizeof(*lpProcesses);
- cbSize -= sizeof(*lpProcesses);
-
- if ( !Process32Next( hSnapshot, &pe ) )
- break;
- }
- }
-
- CloseHandle( hSnapshot );
- }
- else
- SetLastError( ERROR_INVALID_HANDLE );
-
- return fSuccess;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
deleted file mode 100644
index ec4d868..0000000
--- a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
deleted file mode 100644
index f9dc341..0000000
--- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#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);
-static _declspec ( naked ) void FindFirstVolumeMountPointA_Thunk()
-{
- ResolveThunk_TRYLOAD( &kernel32_FindFirstVolumeMountPointA_Ptr, "kernel32" ".dll", "FindFirstVolumeMountPointA", 0, (FARPROC)FindFirstVolumeMountPointA_Failure );
- _asm jmp [kernel32_FindFirstVolumeMountPointA_Ptr] }
-
-//extern "C" _declspec( naked ) HANDLE __stdcall
-//extern "C" HANDLE WINAPI
-extern "C" _declspec( naked ) HANDLE __stdcall FindFirstVolumeMountPointA (LPCSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength)
-{
- _asm jmp [kernel32_FindFirstVolumeMountPointA_Ptr]
-}
-
-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; }
-*/
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
deleted file mode 100644
index 5ac996c..0000000
--- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "macros.h"
-#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
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
deleted file mode 100644
index 627e15c..0000000
--- a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp b/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
deleted file mode 100644
index 2276846..0000000
--- a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
deleted file mode 100644
index dad9cc5..0000000
--- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointA, (HANDLE hFindVolumeMountPoint, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
deleted file mode 100644
index 5e15a9f..0000000
--- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeMountPointW, (HANDLE hFindVolumeMountPoint, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp b/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
deleted file mode 100644
index e7b092f..0000000
--- a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeW, (HANDLE hFindVolume, LPWSTR lpszVolumeName, DWORD cchBufferLength) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindVolumeClose.cpp b/sal/systools/win32/uwinapi/FindVolumeClose.cpp
deleted file mode 100644
index fe028b3..0000000
--- a/sal/systools/win32/uwinapi/FindVolumeClose.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeClose, (HANDLE hFindVolume) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp b/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp
deleted file mode 100644
index 59a4fb2..0000000
--- a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindVolumeMountPointClose, (HANDLE hFindVolumeMountPoint ) )
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
deleted file mode 100644
index 27dee50..0000000
--- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-// GetDiskSpaceExA wrapper for Win 95A
-
-IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetDiskFreeSpaceExA,(
- LPCSTR lpRootPathName, // directory name
- PULARGE_INTEGER lpFreeBytesAvailable, // bytes available to caller
- PULARGE_INTEGER lpTotalNumberOfBytes, // bytes on disk
- PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-))
-{
- DWORD dwSectorsPerCluster, dwBytesPerSector, dwNumberOfFreeClusters, dwTotalNumberOfClusters;
-
- BOOL fSuccess = GetDiskFreeSpaceA( lpRootPathName, &dwSectorsPerCluster, &dwBytesPerSector, &dwNumberOfFreeClusters, &dwTotalNumberOfClusters );
-
- if ( fSuccess )
- {
- ULONGLONG ulBytesPerCluster = (ULONGLONG)dwSectorsPerCluster * (ULONGLONG)dwBytesPerSector;
-
- if ( lpFreeBytesAvailable )
- lpFreeBytesAvailable->QuadPart = ulBytesPerCluster * (ULONGLONG)dwNumberOfFreeClusters;
-
- if ( lpTotalNumberOfBytes )
- lpTotalNumberOfBytes->QuadPart = ulBytesPerCluster * (ULONGLONG)dwTotalNumberOfClusters;
-
- if ( lpTotalNumberOfFreeBytes )
- lpTotalNumberOfFreeBytes->QuadPart = ulBytesPerCluster * (ULONGLONG)dwNumberOfFreeClusters;
- }
-
- return fSuccess;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
deleted file mode 100644
index fd30de2..0000000
--- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, GetDiskFreeSpaceExW,(
- LPCWSTR lpRootPathNameW, // directory name
- PULARGE_INTEGER lpFreeBytesAvailable, // bytes available to caller
- PULARGE_INTEGER lpTotalNumberOfBytes, // bytes on disk
- PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-))
-{
- AUTO_WSTR2STR( lpRootPathName );
-
- return GetDiskFreeSpaceExA( lpRootPathNameA, lpFreeBytesAvailable, lpTotalNumberOfBytes, lpTotalNumberOfFreeBytes );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp b/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
deleted file mode 100644
index 0b14490..0000000
--- a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLogicalDriveStringsW, ( DWORD cchBuffer, LPWSTR lpBufferW ) )
-{
- AUTO_STR( lpBuffer, cchBuffer );
-
- DWORD dwResult = GetLogicalDriveStringsA( cchBuffer, lpBufferA );
-
-
- if ( dwResult && dwResult < cchBuffer )
- STRBUF2WSTR( lpBuffer, (int) (dwResult + 1), (int) cchBuffer );
-
- return dwResult;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLongPathName.cpp b/sal/systools/win32/uwinapi/GetLongPathName.cpp
deleted file mode 100644
index 77df88a..0000000
--- a/sal/systools/win32/uwinapi/GetLongPathName.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-{
- DWORD dwResult = 0; // Assume failure
-
- if ( IsBadStringPtr( lpShortPath, MAX_PATH ) )
- {
- SetLastError( ERROR_INVALID_PARAMETER );
- return dwResult;
- }
-
- // Assume a not existing buffer means a bufsize of zero
- if ( !lpLongPath )
- cchBuffer = 0;
-
- if ( _tcslen( lpShortPath ) == 2 && lpShortPath[1] == ':' )
- {
- _tcscpy( lpLongPath, lpShortPath );
- dwResult = _tcslen( lpLongPath );
- }
- else
- {
- HANDLE hFind;
- WIN32_FIND_DATA aFindFileData;
-
- if ( lpShortPath[_tcslen(lpShortPath)-1] == '\\' )
- {
- TCHAR szFilePath[MAX_PATH];
-
- _tcscpy( szFilePath, lpShortPath );
- _tcscat( szFilePath, TEXT("*.*") );
- hFind = FindFirstFile( szFilePath, &aFindFileData );;
- aFindFileData.cFileName[0] = 0;
- }
- else
- {
- hFind = FindFirstFile( lpShortPath, &aFindFileData );
- if ( !IsValidHandle( hFind ) )
- {
- TCHAR szFilePath[MAX_PATH];
-
- _tcscpy( szFilePath, lpShortPath );
- _tcscat( szFilePath, TEXT("\\*.*") );
- hFind = FindFirstFile( szFilePath, &aFindFileData );;
- aFindFileData.cFileName[0] = 0;
- }
- }
-
- if ( IsValidHandle( hFind ) )
- {
- FindClose( hFind );
-
- LPCTSTR lpLastSlash = _tcsrchr( lpShortPath, '\\' );
-
- if ( lpLastSlash )
- {
- int nParentLen = lpLastSlash - lpShortPath;
- LPTSTR lpParentPath = (LPTSTR)_alloca( (nParentLen + 1) * sizeof(TCHAR) );
-
- CopyMemory( lpParentPath, lpShortPath, nParentLen * sizeof(TCHAR) );
- lpParentPath[nParentLen] = 0;
-
- dwResult = GetLongPathName( lpParentPath, lpLongPath, cchBuffer );
-
- if ( !dwResult )
- _tcscpy( lpLongPath, lpParentPath );
- }
- else
- {
- _tcscpy( lpLongPath, lpShortPath );
- dwResult = _tcslen( lpLongPath );
- }
-
- if ( dwResult < cchBuffer )
- {
- _tcscat( lpLongPath, TEXT("\\") );
- _tcscat( lpLongPath, aFindFileData.cFileName );
- dwResult = _tcslen( lpLongPath );
- }
- else
- dwResult += _tcslen( aFindFileData.cFileName ) + 1;
- }
- }
-
- return dwResult;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp b/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
deleted file mode 100644
index 259b331..0000000
--- a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLongPathNameA, ( LPCTSTR lpShortPath, LPTSTR lpLongPath, DWORD cchBuffer ) )
-#include "GetLongPathName.cpp"
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp b/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
deleted file mode 100644
index 9a47393..0000000
--- a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define UNICODE
-#include "macros.h"
-
-EXTERN_C DWORD WINAPI GetLongPathNameW_NT( LPCWSTR lpShortPath, LPWSTR lpLongPath, DWORD cchBuffer )
-#include "GetLongPathName.cpp"
-
-EXTERN_C DWORD WINAPI GetLongPathNameW_WINDOWS( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer )
-{
- AUTO_WSTR2STR( lpShortPath );
- AUTO_STR( lpLongPath, cchBuffer );
-
- DWORD dwResult = GetLongPathNameA( lpShortPathA, lpLongPathA, cchBuffer );
-
- if ( dwResult && dwResult < cchBuffer )
- STR2WSTR( lpLongPath, cchBuffer );
-
- return dwResult;
-}
-
-
-EXTERN_C void WINAPI ResolveThunk_GetLongPathNameW( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName )
-{
- if ( (LONG)GetVersion() < 0 )
- *lppfn = (FARPROC)GetLongPathNameW_WINDOWS;
- else
- {
- FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
- if ( !lpfnResult )
- lpfnResult = (FARPROC)GetLongPathNameW_NT;
-
- *lppfn = lpfnResult;
- }
-}
-
-
-DEFINE_CUSTOM_THUNK( kernel32, GetLongPathNameW, DWORD, WINAPI, GetLongPathNameW, ( LPCWSTR lpShortPathW, LPWSTR lpLongPathW, DWORD cchBuffer ) );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
deleted file mode 100644
index b765be7..0000000
--- a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "macros.h"
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
-#include <psapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#include <tlhelp32.h>
-
-IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExA, (HANDLE hProcess, HMODULE hModule, LPSTR lpFileName, DWORD nSize ) )
-{
- DWORD dwProcessId = 0;
- DWORD dwResult = 0;
-
- if ( !hProcess || hProcess == GetCurrentProcess() || GetCurrentProcessId() == (dwProcessId = GetProcessId( hProcess )) )
- return GetModuleFileNameA( hModule, lpFileName, nSize );
-
- HANDLE hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPMODULE, dwProcessId );
-
- if ( IsValidHandle( hSnapshot ) )
- {
- MODULEENTRY32 me;
-
- me.dwSize = sizeof(me);
- if ( Module32First( hSnapshot, &me ) )
- {
- BOOL fFound = FALSE;
-
- if ( NULL == hModule )
- fFound = TRUE;
- else do
- {
- fFound = (me.hModule == hModule);
- } while ( !fFound && Module32Next( hSnapshot, &me ) );
-
- if ( fFound )
- {
- dwResult = _tcslen( me.szExePath );
-
- if ( dwResult > nSize && nSize > 0 )
- lpFileName[nSize -1] = 0;
-
- _tcsncpy( lpFileName, me.szExePath, nSize );
- }
- }
-
- CloseHandle( hSnapshot );
- }
-
- return dwResult;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp
deleted file mode 100644
index 2c47673..0000000
--- a/sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "macros.h"
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
-#include <psapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExW, (HANDLE hProcess, HMODULE hModule, LPWSTR lpFileNameW, DWORD nSize ) )
-{
- AUTO_STR( lpFileName, 2 * nSize );
-
- if ( GetModuleFileNameExA( hProcess, hModule, lpFileNameA, 2 * nSize ) )
- return (DWORD) STR2WSTR( lpFileName, nSize );
- else
- return 0;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetProcessId.cpp b/sal/systools/win32/uwinapi/GetProcessId.cpp
deleted file mode 100644
index c0fdd07..0000000
--- a/sal/systools/win32/uwinapi/GetProcessId.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-#include "win95sys.h"
-#include <tlhelp32.h>
-static FARPROC WINAPI GetRealProcAddress( HMODULE hModule, LPCSTR lpProcName )
-{
- FARPROC lpfn = GetProcAddress( hModule, lpProcName );
-
- if ( lpfn )
- {
- if ( 0x68 == *(LPBYTE)lpfn )
- {
- /*
- 82C9F460 68 36 49 F8 BF push 0BFF84936h
- 82C9F465 E9 41 62 2F 3D jmp BFF956AB
- */
-
- lpfn = (FARPROC)*(LPDWORD)((LPBYTE)lpfn + 1);
-
- /*
- BFF956AB 9C pushfd
- BFF956AC FC cld
- BFF956AD 50 push eax
- BFF956AE 53 push ebx
- BFF956AF 52 push edx
- BFF956B0 64 8B 15 20 00 00 00 mov edx,dword ptr fs:[20h]
- BFF956B7 0B D2 or edx,edx
- BFF956B9 74 09 je BFF956C4
- BFF956BB 8B 42 04 mov eax,dword ptr [edx+4]
- BFF956BE 0B C0 or eax,eax
- BFF956C0 74 07 je BFF956C9
- BFF956C2 EB 42 jmp BFF95706
- BFF956C4 5A pop edx
- BFF956C5 5B pop ebx
- BFF956C6 58 pop eax
- BFF956C7 9D popfd
- BFF956C8 C3 ret
- */
- }
- }
-
- return lpfn;
-}
-
-
-typedef DWORD (WINAPI OBFUSCATE)( DWORD dwPTID );
-typedef OBFUSCATE *LPOBFUSCATE;
-
-static DWORD WINAPI Obfuscate( DWORD dwPTID )
-{
- static LPOBFUSCATE lpfnObfuscate = NULL;
-
- if ( !lpfnObfuscate )
- {
- LPBYTE lpCode = (LPBYTE)GetRealProcAddress( GetModuleHandleA("KERNEL32"), "GetCurrentThreadId" );
-
- if ( lpCode )
- {
- /*
- GetCurrentThreadId:
- lpCode + 00 BFF84936 A1 DC 9C FC BF mov eax,[BFFC9CDC] ; This is the real thread id
- lpcode + 05 BFF8493B FF 30 push dword ptr [eax]
- lpCode + 07 BFF8493D E8 17 C5 FF FF call BFF80E59 ; call Obfuscate function
- lpcode + 0C BFF84942 C3 ret
- */
-
- DWORD dwOffset = *(LPDWORD)(lpCode + 0x08);
-
- lpfnObfuscate = (LPOBFUSCATE)(lpCode + 0x0C + dwOffset);
- /*
- Obfuscate:
- BFF80E59 A1 CC 98 FC BF mov eax,[BFFC98CC]
- BFF80E5E 85 C0 test eax,eax
- BFF80E60 75 04 jne BFF80E66
- BFF80E62 33 C0 xor eax,eax
- BFF80E64 EB 04 jmp BFF80E6A
- BFF80E66 33 44 24 04 xor eax,dword ptr [esp+4]
- BFF80E6A C2 04 00 ret 4
- */
- }
-
- }
-
- return lpfnObfuscate ? lpfnObfuscate( dwPTID ) : 0;
-}
-
-
-EXTERN_C DWORD WINAPI GetProcessId_WINDOWS( HANDLE hProcess )
-{
- if ( GetCurrentProcess() == hProcess )
- return GetCurrentProcessId();
-
- DWORD dwProcessId = 0;
- PPROCESS_DATABASE pPDB = (PPROCESS_DATABASE)Obfuscate( GetCurrentProcessId() );
-
- if ( pPDB && K32OBJ_PROCESS == pPDB->Type )
- {
- DWORD dwHandleNumber = (DWORD)hProcess >> 2;
-
- if ( 0 == ((DWORD)hProcess & 0x03) && dwHandleNumber < pPDB->pHandleTable->cEntries )
- {
- if (
- pPDB->pHandleTable->array[dwHandleNumber].pObject &&
- K32OBJ_PROCESS == pPDB->pHandleTable->array[dwHandleNumber].pObject->Type
- )
- dwProcessId = Obfuscate( (DWORD)pPDB->pHandleTable->array[dwHandleNumber].pObject );
- }
-
- SetLastError( ERROR_INVALID_HANDLE );
- }
-
- return dwProcessId;
-}
-
-
-EXTERN_C DWORD WINAPI GetProcessId_NT( HANDLE hProcess )
-{
- SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
- return 0;
-}
-
-
-EXTERN_C void WINAPI ResolveThunk_GetProcessId( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName )
-{
- if ( (LONG)GetVersion() < 0 )
- *lppfn = (FARPROC)GetProcessId_WINDOWS;
- else
- {
- FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
- if ( !lpfnResult )
- lpfnResult = (FARPROC)GetProcessId_NT;
-
- *lppfn = lpfnResult;
- }
-}
-
-
-DEFINE_CUSTOM_THUNK( kernel32, GetProcessId, DWORD, WINAPI, GetProcessId, ( HANDLE hProcess ) );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp b/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp
deleted file mode 100644
index cf94a77..0000000
--- a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.h"
-
-IMPLEMENT_THUNK( kernel32, WINDOWS, LANGID, WINAPI, GetUserDefaultUILanguage,())
-{
- return LANGIDFROMLCID(GetUserDefaultLCID());
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomainA.cpp b/sal/systools/win32/uwinapi/GetUserDomainA.cpp
deleted file mode 100644
index 92cd9ea..0000000
--- a/sal/systools/win32/uwinapi/GetUserDomainA.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "macros.h"
-
-EXTERN_C DWORD WINAPI GetUserDomainA_NT( LPSTR lpBuffer, DWORD nSize )
-#include "GetUserDomain_NT.cpp"
-
-EXTERN_C DWORD WINAPI GetUserDomainA_WINDOWS( LPSTR lpBuffer, DWORD nSize )
-#include "GetUserDomain_WINDOWS.cpp"
-
-EXTERN_C void WINAPI ResolveThunk_GetUserDomainA( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName )
-{
- if ( (LONG)GetVersion() < 0 )
- *lppfn = (FARPROC)GetUserDomainA_WINDOWS;
- else
- *lppfn = (FARPROC)GetUserDomainA_NT;
-}
-
-DEFINE_CUSTOM_THUNK( kernel32, GetUserDomainA, DWORD, WINAPI, GetUserDomainA, ( LPSTR lpBuffer, DWORD nSize ) );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomainW.cpp b/sal/systools/win32/uwinapi/GetUserDomainW.cpp
deleted file mode 100644
index 0a34fe3..0000000
--- a/sal/systools/win32/uwinapi/GetUserDomainW.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define UNICODE
-#include "macros.h"
-
-EXTERN_C DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize )
-#include "GetUserDomain_NT.cpp"
-
-
-EXTERN_C DWORD WINAPI GetUserDomainW_WINDOWS( LPWSTR lpBuffer, DWORD nSize )
-#include "GetUserDomain_WINDOWS.cpp"
-
-EXTERN_C void WINAPI ResolveThunk_GetUserDomainW( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName )
-{
- if ( (LONG)GetVersion() < 0 )
- *lppfn = (FARPROC)GetUserDomainW_WINDOWS;
- else
- *lppfn = (FARPROC)GetUserDomainW_NT;
-}
-
-DEFINE_CUSTOM_THUNK( kernel32, GetUserDomainW, DWORD, WINAPI, GetUserDomainW, ( LPWSTR lpBuffer, DWORD cchBuffer ) );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp b/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp
deleted file mode 100644
index acbb450..0000000
--- a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-{
- return GetEnvironmentVariable( TEXT("USERDOMAIN"), lpBuffer, nSize );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp b/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
deleted file mode 100644
index 2ed058d..0000000
--- a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-{
- HKEY hkeyLogon;
- HKEY hkeyWorkgroup;
- DWORD dwResult = 0;
-
-
- if ( ERROR_SUCCESS == RegOpenKeyEx(
- HKEY_LOCAL_MACHINE,
- TEXT("Network\\Logon"),
- 0, KEY_READ, &hkeyLogon ) )
- {
- DWORD dwLogon = 0;
- DWORD dwLogonSize = sizeof(dwLogon);
- RegQueryValueEx( hkeyLogon, TEXT("LMLogon"), 0, NULL, (LPBYTE)&dwLogon, &dwLogonSize );
- RegCloseKey( hkeyLogon );
-
- if ( dwLogon )
- {
- HKEY hkeyNetworkProvider;
-
- if ( ERROR_SUCCESS == RegOpenKeyEx(
- HKEY_LOCAL_MACHINE,
- TEXT("SYSTEM\\CurrentControlSet\\Services\\MSNP32\\NetworkProvider"),
- 0, KEY_READ, &hkeyNetworkProvider ) )
- {
- DWORD dwBufferSize = nSize;
- LONG lResult = RegQueryValueEx( hkeyNetworkProvider, TEXT("AuthenticatingAgent"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize );
-
- if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult )
- dwResult = dwBufferSize / sizeof(TCHAR);
-
- RegCloseKey( hkeyNetworkProvider );
- }
- }
- }
- else if ( ERROR_SUCCESS == RegOpenKeyEx(
- HKEY_LOCAL_MACHINE,
- TEXT("SYSTEM\\CurrentControlSet\\Services\\VxD\\VNETSUP"),
- 0, KEY_READ, &hkeyWorkgroup ) )
- {
- DWORD dwBufferSize = nSize;
- LONG lResult = RegQueryValueEx( hkeyWorkgroup, TEXT("Workgroup"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize );
-
- if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult )
- dwResult = dwBufferSize / sizeof(TCHAR);
-
- RegCloseKey( hkeyWorkgroup );
- }
-
-
- return dwResult;
-}
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list