[Libreoffice-commits] .: 3 commits - sal/inc sal/systools sal/util sal/workben
Tor Lillqvist
tml at kemper.freedesktop.org
Sun May 22 15:54:31 PDT 2011
sal/inc/systools/win32/advapi9x.h | 212 ------------------
sal/inc/systools/win32/comdlg9x.h | 83 -------
sal/inc/systools/win32/kernel9x.h | 385 ---------------------------------
sal/inc/systools/win32/mpr9x.h | 75 ------
sal/inc/systools/win32/shell9x.h | 104 --------
sal/inc/systools/win32/user9x.h | 195 ----------------
sal/systools/win32/uwinapi/makefile.mk | 7
sal/util/makefile.mk | 9
sal/workben/makefile.mk | 38 ---
sal/workben/saldyntest.c | 54 ----
sal/workben/salstattest.c | 55 ----
11 files changed, 1217 deletions(-)
New commits:
commit fa32d93d828b2ef1b9194696a401cea7047cbd94
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon May 23 01:53:36 2011 +0300
No need to build a static sal archive
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index c455fac..be06d16 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -66,15 +66,6 @@ LIB1FILES= \
$(SLB)$/cpprtl.lib \
$(SLB)$/textenc.lib
-LIB3TARGET=$(LB)$/a$(TARGET).lib
-LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-LIB3FILES= \
- $(LB)$/oslall.lib \
- $(LB)$/cpposl.lib \
- $(LB)$/cpprtl.lib \
- $(LB)$/textenc.lib
-
-
.IF "$(GUI)" == "WNT"
SHL1TARGET= $(TARGET)
.ELSE
commit ce0d92a9d8d42c8790358d049787147d8c4d8cfa
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon May 23 01:47:44 2011 +0300
No need to build import library separately here
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
index 9a09411..5713a53 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -145,11 +145,4 @@ SHL1STDLIBS+=\
.ENDIF
-.IF "$(COM)"=="GCC"
-ALL: ALLTAR $(LB)$/libuwinapi.a
-
-$(LB)$/libuwinapi.a: $(MISC)$/uwinapi.def
- $(DLLTOOL) --dllname uwinapi.dll --input-def=$(MISC)$/uwinapi.def --kill-at --output-lib=$(LB)$/libuwinapi.a
-.ENDIF
-
.INCLUDE : target.mk
commit 6e018cbc581ef4eca0da4da192267d7543e82069
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon May 23 01:45:25 2011 +0300
Remove useless cruft
diff --git a/sal/inc/systools/win32/advapi9x.h b/sal/inc/systools/win32/advapi9x.h
deleted file mode 100644
index 6dc64f6..0000000
--- a/sal/inc/systools/win32/advapi9x.h
+++ /dev/null
@@ -1,212 +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.
- *
- ************************************************************************/
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-// begin obsolete Win32 API functions -->
-#ifdef RegOpenKey
-#undef RegOpenKey
-#endif
-#ifdef RegEnumKey
-#undef RegEnumKey
-#endif
-#ifdef RegCreateKey
-#undef RegCreateKey
-#endif
-#ifdef RegQueryValue
-#undef RegQueryValue
-#endif
-#ifdef RegSetValue
-#undef RegSetValue
-#endif
-// <-- end obsolete Win32 functions
-
-#ifdef RegOpenKeyExW
-#undef RegOpenKeyExW
-#endif
-#ifdef RegEnumKeyExW
-#undef RegEnumKeyExW
-#endif
-#ifdef RegCreateKeyExW
-#undef RegCreateKeyExW
-#endif
-#ifdef RegDeleteKeyW
-#undef RegDeleteKeyW
-#endif
-#ifdef RegEnumValueW
-#undef RegEnumValueW
-#endif
-#ifdef RegQueryValueExW
-#undef RegQueryValueExW
-#endif
-#ifdef RegSetValueExW
-#undef RegSetValueExW
-#endif
-#ifdef RegDeleteValueW
-#undef RegDeleteValueW
-#endif
-#ifdef RegQueryInfoKeyW
-#undef RegQueryInfoKeyW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define ADVAPI9X_API extern
-
- //------------------------------------------------------------------------
-// declare function pointers to the appropriate shell functions
-//------------------------------------------------------------------------
-
-ADVAPI9X_API LONG (WINAPI * lpfnRegOpenKeyExW) (
- HKEY hKey, // handle to open key
- LPCWSTR lpSubKey, // subkey name
- DWORD ulOptions, // reserved
- REGSAM samDesired, // security access mask
- PHKEY phkResult // handle to open key
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegEnumKeyExW) (
- HKEY hKey, // handle to key to enumerate
- DWORD dwIndex, // subkey index
- LPWSTR lpName, // subkey name
- LPDWORD lpcName, // size of subkey buffer
- LPDWORD lpReserved, // reserved
- LPWSTR lpClass, // class string buffer
- LPDWORD lpcClass, // size of class string buffer
- PFILETIME lpftLastWriteTime // last write time
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegCreateKeyExW)(
- HKEY hKey, // handle to open key
- LPCWSTR lpSubKey, // subkey name
- DWORD Reserved, // reserved
- LPWSTR lpClass, // class string
- DWORD dwOptions, // special options
- REGSAM samDesired, // desired security access
- LPSECURITY_ATTRIBUTES lpSecurityAttributes, // inheritance
- PHKEY phkResult, // key handle
- LPDWORD lpdwDisposition // disposition value buffer
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegDeleteKeyW) (
- HKEY hKey, // handle to open key
- LPCWSTR lpSubKey // subkey name
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegEnumValueW) (
- HKEY hKey, // handle to key to query
- DWORD dwIndex, // index of value to query
- LPWSTR lpValueName, // value buffer
- LPDWORD lpcValueName, // size of value buffer
- LPDWORD lpReserved, // reserved
- LPDWORD lpType, // type buffer
- LPBYTE lpData, // data buffer
- LPDWORD lpcbData // size of data buffer
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegQueryValueExW) (
- HKEY hKey, // handle to key
- LPCWSTR lpValueName, // value name
- LPDWORD lpReserved, // reserved
- LPDWORD lpType, // type buffer
- LPBYTE lpData, // data buffer
- LPDWORD lpcbData // size of data buffer
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegSetValueExW)(
- HKEY hKey, // handle to key
- LPCWSTR lpValueName, // value name
- DWORD Reserved, // reserved
- DWORD dwType, // value type
- CONST BYTE *lpData, // value data
- DWORD cbData // size of value data
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegDeleteValueW) (
- HKEY hKey, // handle to key
- LPCWSTR lpValueName // value name
-);
-
-ADVAPI9X_API LONG (WINAPI *lpfnRegQueryInfoKeyW) (
- HKEY hKey, // handle to key to query
- LPWSTR lpClassW, // address of buffer for class string
- LPDWORD lpcbClass, // address of size of class string buffer
- LPDWORD lpReserved, // reserved
- LPDWORD lpcSubKeys, // address of buffer for number of
- // subkeys
- LPDWORD lpcbMaxSubKeyLen, // address of buffer for longest subkey
- // name length
- LPDWORD lpcbMaxClassLen, // address of buffer for longest class
- // string length
- LPDWORD lpcValues, // address of buffer for number of value
- // entries
- LPDWORD lpcbMaxValueNameLen, // address of buffer for longest
- // value name length
- LPDWORD lpcbMaxValueLen, // address of buffer for longest value
- // data length
- LPDWORD lpcbSecurityDescriptor, // address of buffer for security
- // descriptor length
- PFILETIME lpftLastWriteTime // address of buffer for last write time
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define RegOpenKeyExW lpfnRegOpenKeyExW
-#define RegEnumKeyExW lpfnRegEnumKeyExW
-#define RegCreateKeyExW lpfnRegCreateKeyExW
-#define RegDeleteKeyW lpfnRegDeleteKeyW
-#define RegEnumValueW lpfnRegEnumValueW
-#define RegQueryValueExW lpfnRegQueryValueExW
-#define RegSetValueExW lpfnRegSetValueExW
-#define RegDeleteValueW lpfnRegDeleteValueW
-#define RegQueryInfoKeyW lpfnRegQueryInfoKeyW
-
-#ifdef __cplusplus
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/comdlg9x.h b/sal/inc/systools/win32/comdlg9x.h
deleted file mode 100644
index e12fe89..0000000
--- a/sal/inc/systools/win32/comdlg9x.h
+++ /dev/null
@@ -1,83 +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.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifndef _COMMDLG_H_
-#include <commdlg.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef GetOpenFileNameW
-#undef GetOpenFileNameW
-#endif
-
-#ifdef GetSaveFileNameW
-#undef GetSaveFileNameW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define COMDLG9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate comdlg functions
-//------------------------------------------------------------------------
-
-COMDLG9X_API BOOL ( WINAPI * lpfnGetOpenFileNameW ) ( LPOPENFILENAMEW lpofn );
-COMDLG9X_API BOOL ( WINAPI * lpfnGetSaveFileNameW ) ( LPOPENFILENAMEW lpofn );
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define GetOpenFileNameW lpfnGetOpenFileNameW
-#define GetSaveFileNameW lpfnGetSaveFileNameW
-
-#ifdef __cplusplus
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/kernel9x.h b/sal/inc/systools/win32/kernel9x.h
deleted file mode 100644
index 799ac5e..0000000
--- a/sal/inc/systools/win32/kernel9x.h
+++ /dev/null
@@ -1,385 +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.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the winbase.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef LoadLibraryW
-#undef LoadLibraryW
-#endif
-
-#ifdef LoadLibraryExW
-#undef LoadLibraryExW
-#endif
-
-#ifdef GetModuleFileNameW
-#undef GetModuleFileNameW
-#endif
-
-#ifdef GetLogicalDriveStringsW
-#undef GetLogicalDriveStringsW
-#endif
-
-#ifdef DeleteFileW
-#undef DeleteFileW
-#endif
-
-#ifdef CopyFileW
-#undef CopyFileW
-#endif
-
-#ifdef MoveFileW
-#undef MoveFileW
-#endif
-
-#ifdef MoveFileExW
-#undef MoveFileExW
-#endif
-
-#ifdef CreateFileW
-#undef CreateFileW
-#endif
-
-#ifdef RemoveDirectoryW
-#undef RemoveDirectoryW
-#endif
-
-#ifdef CreateDirectoryW
-#undef CreateDirectoryW
-#endif
-
-#ifdef CreateDirectoryExW
-#undef CreateDirectoryExW
-#endif
-
-#ifdef CreateFileW
-#undef CreateFileW
-#endif
-
-#ifdef GetLongPathNameW
-#undef GetLongPathNameW
-#endif
-
-#ifdef GetLocaleInfoW
-#undef GetLocaleInfoW
-#endif
-
-#ifdef GetFullPathNameW
-#undef GetFullPathNameW
-#endif
-
-#ifdef CreateProcessW
-#undef CreateProcessW
-#endif
-
-#ifdef CreateProcessAsUserW
-#undef CreateProcessAsUserW
-#endif
-
-#ifdef GetEnvironmentVariableW
-#undef GetEnvironmentVariableW
-#endif
-
-#ifdef GetDriveTypeW
-#undef GetDriveTypeW
-#endif
-
-#ifdef GetCurrentDirectoryW
-#undef GetCurrentDirectoryW
-#endif
-
-#ifdef SetCurrentDirectoryW
-#undef SetCurrentDirectoryW
-#endif
-
-#ifdef GetVolumeInformationW
-#undef GetVolumeInformationW
-#endif
-
-
-#ifdef GetDiskFreeSpaceExA
-#undef GetDiskFreeSpaceExA
-#endif
-
-#ifdef GetDiskFreeSpaceExW
-#undef GetDiskFreeSpaceExW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define KERNEL9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate kernel functions
-//------------------------------------------------------------------------
-
-//BOOL WINAPI RegisterServiceProcess( DWORD dwProcessID, BOOL fRegister );
-
-KERNEL9X_API HMODULE (WINAPI *lpfnLoadLibraryExW ) (
- LPCWSTR lpLibFileName, // file name of module
- HANDLE hFile, // reserved, must be NULL
- DWORD dwFlags // entry-point execution option
-);
-
-KERNEL9X_API DWORD (WINAPI *lpfnGetModuleFileNameW ) (
- HMODULE hModule, // handle to module
- LPWSTR lpFilename, // file name of module
- DWORD nSize // size of buffer
-);
-
-KERNEL9X_API DWORD (WINAPI *lpfnGetLogicalDriveStringsW ) (
- DWORD nBufferLength, // size of buffer
- LPWSTR lpBuffer // drive strings buffer
-);
-
-KERNEL9X_API HANDLE ( WINAPI *lpfnCreateFileW )(
- LPCWSTR lpFileName,
- DWORD dwDesiredAccess,
- DWORD dwShareMode,
- LPSECURITY_ATTRIBUTES lpSecurityAttributes,
- DWORD dwCreationDisposition,
- DWORD dwFlagsAndAttributes,
- HANDLE hTemplateFile
-);
-
-KERNEL9X_API DWORD WINAPI GetCanonicalPathNameA(
- LPCSTR lpszPath, // file name
- LPSTR lpszCanonicalPath, // path buffer
- DWORD cchBuffer // size of path buffer
-);
-
-KERNEL9X_API DWORD WINAPI GetCanonicalPathNameW(
- LPCWSTR lpszPath, // file name
- LPWSTR lpszCanonicalPath, // path buffer
- DWORD cchBuffer // size of path buffer
-);
-
-KERNEL9X_API HANDLE ( WINAPI * lpfnCreateFileW ) (
- LPCWSTR lpFileName,
- DWORD dwDesiredAccess,
- DWORD dwShareMode,
- LPSECURITY_ATTRIBUTES lpSecurityAttributes,
- DWORD dwCreationDisposition,
- DWORD dwFlagsAndAttributes,
- HANDLE hTemplateFile );
-
-KERNEL9X_API BOOL (WINAPI *lpfnDeleteFileW ) (
- LPCWSTR lpFileName // file name
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnCopyFileW ) (
- LPCWSTR lpExistingFileName, // file name
- LPCWSTR lpNewFileName, // new file name
- BOOL bFailIfExist // operation if file exists
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnMoveFileW ) (
- LPCWSTR lpExistingFileName, // file name
- LPCWSTR lpNewFileName // new file name
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnMoveFileExW ) (
- LPCWSTR lpExistingFileName, // file name
- LPCWSTR lpNewFileName, // new file name
- DWORD dwFlags // move options
-);
-
-KERNEL9X_API BOOL (WINAPI *lpfnRemoveDirectoryW ) (
- LPCWSTR lpPathName // directory name
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateDirectoryW ) (
- LPCWSTR lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes );
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateDirectoryExW ) (
- LPCWSTR lpTemplateDirectory,
- LPCWSTR lpNewDirectory,
- LPSECURITY_ATTRIBUTES lpSecurityAttributes );
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetLongPathNameW ) (
- LPCWSTR lpszShortPath, // file name
- LPWSTR lpszLongPath, // path buffer
- DWORD cchBuffer // size of path buffer
-);
-
-// GetCanonicalPath is a tool function with no exact counterpart
-// in the win32 api; we use nevertheless a function pointer
-// because every variable etc. must root in the Kernel9x.lib else
-// we loose our AutoSystoolInit object during linking
-KERNEL9X_API DWORD ( WINAPI * lpfnGetCanonicalPathW ) (
- LPCWSTR lpszPath, // file name
- LPWSTR lpszCanonicalPath, // path buffer
- DWORD cchBuffer // size of path buffer
-);
-
-KERNEL9X_API int ( WINAPI* lpfnGetLocaleInfoW ) (
- LCID Locale, // locale identifier
- LCTYPE LCType, // information type
- LPWSTR lpLCData, // information buffer
- int cchData // size of buffer
-);
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetFullPathNameW )(
- LPCWSTR lpFileName, // file name
- DWORD nBufferLength, // size of path buffer
- LPWSTR lpBuffer, // path buffer
- LPWSTR *lpFilePart // address of file name in path
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateProcessW )(
- LPCWSTR lpApplicationName, // name of executable module
- LPWSTR lpCommandLine, // command line string
- LPSECURITY_ATTRIBUTES lpProcessAttributes, // SD
- LPSECURITY_ATTRIBUTES lpThreadAttributes, // SD
- BOOL bInheritHandles, // handle inheritance option
- DWORD dwCreationFlags, // creation flags
- LPVOID lpEnvironment, // new environment block
- LPCWSTR lpCurrentDirectory, // current directory name
- LPSTARTUPINFOW lpStartupInfo, // startup information
- LPPROCESS_INFORMATION lpProcessInformation // process information
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnCreateProcessAsUserW )(
- HANDLE hToken, // handle to user token
- LPCWSTR lpApplicationName, // name of executable module
- LPWSTR lpCommandLine, // command-line string
- LPSECURITY_ATTRIBUTES lpProcessAttributes, // SD
- LPSECURITY_ATTRIBUTES lpThreadAttributes, // SD
- BOOL bInheritHandles, // inheritance option
- DWORD dwCreationFlags, // creation flags
- LPVOID lpEnvironment, // new environment block
- LPCWSTR lpCurrentDirectory, // current directory name
- LPSTARTUPINFOW lpStartupInfo, // startup information
- LPPROCESS_INFORMATION lpProcessInformation // process information
-);
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetEnvironmentVariableW )(
- LPCWSTR lpName, // environment variable name
- LPWSTR lpBuffer, // buffer for variable value
- DWORD nSize // size of buffer
-);
-
-
-KERNEL9X_API UINT ( WINAPI * lpfnGetDriveTypeW )(
- LPCWSTR lpRootPathName // root directory
-);
-
-KERNEL9X_API DWORD ( WINAPI * lpfnGetCurrentDirectoryW )(
- DWORD nBufferLength, // size of directory buffer
- LPWSTR lpBuffer // directory buffer
-);
-
-KERNEL9X_API BOOL ( WINAPI * lpfnSetCurrentDirectoryW )(
- LPCWSTR lpPathName // new directory name
-);
-
-// GetVolumeInformation
-KERNEL9X_API BOOL ( WINAPI* lpfnGetVolumeInformationW )(
- LPCWSTR lpRootPathName, // root directory
- LPWSTR lpVolumeNameBuffer, // volume name buffer
- DWORD nVolumeNameSize, // length of name buffer
- LPDWORD lpVolumeSerialNumber, // volume serial number
- LPDWORD lpMaximumComponentLength, // maximum file name length
- LPDWORD lpFileSystemFlags, // file system options
- LPWSTR lpFileSystemName, // file system name buffer
- DWORD nFileSystemNameSize // length of file system name buffer
-);
-
-// GetDiskFreeSpaceExA
-KERNEL9X_API BOOL (WINAPI *lpfnGetDiskFreeSpaceExA)(
- LPCSTR lpDirectoryName, // directory name
- PULARGE_INTEGER lpFreeBytesAvailable, // bytes available to caller
- PULARGE_INTEGER lpTotalNumberOfBytes, // bytes on disk
- PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-);
-
-// GetDiskFreeSpaceExW
-KERNEL9X_API BOOL (WINAPI *lpfnGetDiskFreeSpaceExW)(
- LPCWSTR lpDirectoryName, // directory name
- PULARGE_INTEGER lpFreeBytesAvailable, // bytes available to caller
- PULARGE_INTEGER lpTotalNumberOfBytes, // bytes on disk
- PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define LoadLibraryExW lpfnLoadLibraryExW
-#define LoadLibraryW(c) LoadLibraryExW(c, NULL, 0)
-#define GetModuleFileNameW lpfnGetModuleFileNameW
-#define GetLogicalDriveStringsW lpfnGetLogicalDriveStringsW
-#define CreateFileW lpfnCreateFileW
-#define DeleteFileW lpfnDeleteFileW
-#define CopyFileW lpfnCopyFileW
-#define MoveFileW lpfnMoveFileW
-#define MoveFileExW lpfnMoveFileExW
-#define RemoveDirectoryW lpfnRemoveDirectoryW
-#define CreateDirectoryW lpfnCreateDirectoryW
-#define CreateDirectoryExW lpfnCreateDirectoryExW
-#define GetLongPathNameW lpfnGetLongPathNameW
-#define GetFullPathNameW lpfnGetFullPathNameW
-
-#define GetCanonicalPath lpfnGetCanonicalPathW
-#define GetLocaleInfoW lpfnGetLocaleInfoW
-
-#define CreateProcessW lpfnCreateProcessW
-#define CreateProcessAsUserW lpfnCreateProcessAsUserW
-#define GetEnvironmentVariableW lpfnGetEnvironmentVariableW
-#define GetDriveTypeW lpfnGetDriveTypeW
-
-#define GetCurrentDirectoryW lpfnGetCurrentDirectoryW
-#define SetCurrentDirectoryW lpfnSetCurrentDirectoryW
-
-#define GetVolumeInformationW lpfnGetVolumeInformationW
-#define GetDiskFreeSpaceExA lpfnGetDiskFreeSpaceExA
-#define GetDiskFreeSpaceExW lpfnGetDiskFreeSpaceExW
-
-#ifdef __cplusplus
-}
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/mpr9x.h b/sal/inc/systools/win32/mpr9x.h
deleted file mode 100644
index c8a53d1..0000000
--- a/sal/inc/systools/win32/mpr9x.h
+++ /dev/null
@@ -1,75 +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.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the winuser.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef WNetGetConnectionW
-#undef WNetGetConnectionW
-#endif
-
-//------------------------------------------------------------------------
-// defines
-//------------------------------------------------------------------------
-
-#define MPR9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate user32 functions
-//------------------------------------------------------------------------
-
-MPR9X_API DWORD (WINAPI *lpfnWNetGetConnectionW)(
- LPCWSTR lpLocalName, // pointer to local name
- LPWSTR lpRemoteName, // pointer to buffer for remote name
- LPDWORD lpnLength // pointer to buffer size, in characters
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define WNetGetConnectionW lpfnWNetGetConnectionW
-
-#ifdef __cplusplus
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/shell9x.h b/sal/inc/systools/win32/shell9x.h
deleted file mode 100644
index 4e4fa35..0000000
--- a/sal/inc/systools/win32/shell9x.h
+++ /dev/null
@@ -1,104 +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.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _SHELL9X_H_
-#define _SHELL9X_H_
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifndef _SHLOBJ_H_
-#include <shlobj.h>
-#endif
-
-#include <shellapi.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef CommandLineToArgvW
-#undef CommandLineToArgvW
-#endif
-
-#ifdef SHBrowseForFolderW
-#undef SHBrowseForFolderW
-#endif
-
-#ifdef SHGetPathFromIDListW
-#undef SHGetPathFromIDListW
-#endif
-
-#ifdef ShellExecuteExW
-#undef ShellExecuteExW
-#endif
-
-//------------------------------------------------------------------------
-// set the compiler directives for the function pointer we declare below
-// if we build sal or sal will be used as static library we define extern
-// else sal exports the function pointers from a dll and we use __declspec
-//------------------------------------------------------------------------
-
-#define SHELL9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate shell functions
-//------------------------------------------------------------------------
-
-SHELL9X_API LPWSTR * ( WINAPI * lpfnCommandLineToArgvW ) ( LPCWSTR lpCmdLine, int *pNumArgs );
-SHELL9X_API LPITEMIDLIST ( WINAPI * lpfnSHBrowseForFolderW ) ( LPBROWSEINFOW lpbi );
-SHELL9X_API BOOL ( WINAPI * lpfnSHGetPathFromIDListW ) ( LPCITEMIDLIST pidl, LPWSTR pszPath );
-
-SHELL9X_API BOOL ( WINAPI * lpfnShellExecuteExW ) ( LPSHELLEXECUTEINFOW lpExecInfo );
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define CommandLineToArgvW lpfnCommandLineToArgvW
-#define SHBrowseForFolderW lpfnSHBrowseForFolderW
-#define SHGetPathFromIDListW lpfnSHGetPathFromIDListW
-
-#define ShellExecuteExW lpfnShellExecuteExW
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/user9x.h b/sal/inc/systools/win32/user9x.h
deleted file mode 100644
index d502251..0000000
--- a/sal/inc/systools/win32/user9x.h
+++ /dev/null
@@ -1,195 +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.
- *
- ************************************************************************/
-
-#pragma once
-
-#ifndef _WINDOWS_
-#include <windows.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-//------------------------------------------------------------------------
-// undefine the macros defined in the winuser.h file in order to avoid
-// warnings because of multiple defines
-//------------------------------------------------------------------------
-
-#ifdef SendMessageW
-#undef SendMessageW
-#endif
-
-#ifdef CreateWindowExW
-#undef CreateWindowExW
-#endif
-
-#ifdef RegisterClassExW
-#undef RegisterClassExW
-#endif
-
-#ifdef UnregisterClassW
-#undef UnregisterClassW
-#endif
-
-#ifdef RegisterClipboardFormatW
-#undef RegisterClipboardFormatW
-#endif
-
-#ifdef GetClipboardFormatNameW
-#undef GetClipboardFormatNameW
-#endif
-
-#ifdef SetWindowTextW
-#undef SetWindowTextW
-#endif
-
-#ifdef GetWindowTextW
-#undef GetWindowTextW
-#endif
-
-#ifdef InsertMenuItemW
-#undef InsertMenuItemW
-#endif
-
-#ifndef DrawTextW
-#undef DrawTextW
-#endif
-
-//------------------------------------------------------------------------
-// defines
-//------------------------------------------------------------------------
-
-#define USER9X_API extern
-
-//------------------------------------------------------------------------
-// declare function pointers to the appropriate user32 functions
-//------------------------------------------------------------------------
-
-USER9X_API LRESULT ( WINAPI * lpfnSendMessageW) (
- HWND hWnd, // handle to the destination window
- UINT Msg, // message
- WPARAM wParam, // first message parameter
- LPARAM lParam // second message parameter
-);
-
-USER9X_API HWND ( WINAPI * lpfnCreateWindowExW ) (
- DWORD dwExStyle, // extended window style
- LPCWSTR lpClassName, // registered class name
- LPCWSTR lpWindowName, // window name
- DWORD dwStyle, // window style
- int x, // horizontal position of window
- int y, // vertical position of window
- int nWidth, // window width
- int nHeight, // window height
- HWND hWndParent, // handle to parent or owner window
- HMENU hMenu, // menu handle or child identifier
- HINSTANCE hInstance, // handle to application instance
- LPVOID lpParam // window-creation data
-);
-
-USER9X_API ATOM ( WINAPI * lpfnRegisterClassExW ) (
- CONST WNDCLASSEXW* lpwcx // class data
-);
-
-USER9X_API BOOL ( WINAPI * lpfnUnregisterClassW ) (
- LPCWSTR lpClassName, // class name
- HINSTANCE hInstance // handle to application instance
-);
-
-USER9X_API UINT (WINAPI * lpfnRegisterClipboardFormatW) (
- LPCWSTR lpszFormat // name of new format
-);
-
-USER9X_API int ( WINAPI * lpfnGetClipboardFormatNameW ) (
- UINT format, // clipboard format to retrieve
- LPWSTR lpszFormatName, // format name
- int cchMaxCount // length of format name buffer
-);
-
-USER9X_API BOOL ( WINAPI * lpfnSetWindowTextW ) (
- HWND hWnd,
- LPCWSTR lpString
-);
-
-USER9X_API int ( WINAPI * lpfnGetWindowTextW ) (
- HWND hWnd, // handle to the window or control
- LPWSTR lpString, // text buffer
- int nMaxCount // length of text buffer
-);
-
-USER9X_API BOOL ( WINAPI * lpfnInsertMenuItemW ) (
- HMENU hMenu, // handle to menu
- UINT uItem, // identifier or position
- BOOL fByPosition, // meaning of uItem
- LPCMENUITEMINFOW lpmii // menu item information
-);
-
-USER9X_API int ( WINAPI * lpfnDrawTextW ) (
- HDC hDC, // handle to DC
- LPCWSTR lpString, // text to draw
- int nCount, // text length
- LPRECT lpRect, // formatting dimensions
- UINT uFormat // text-drawing options
-);
-
-USER9X_API BOOL ( WINAPI * lpfnDrawStateW ) (
- HDC hdc, // handle to device context
- HBRUSH hbr, // handle to brush
- DRAWSTATEPROC lpOutputFunc, // callback function
- LPARAM lData, // image information
- WPARAM wData, // more image information
- int x, // horizontal location
- int y, // vertical location
- int cx, // image width
- int cy, // image height
- UINT fuFlags // image type and state
-);
-
-//------------------------------------------------------------------------
-// redefine the above undefined macros so that the preprocessor replaces
-// all occurrences of this macros with our function pointer
-//------------------------------------------------------------------------
-
-#define SendMessageW lpfnSendMessageW
-#define CreateWindowExW lpfnCreateWindowExW
-#define RegisterClassExW lpfnRegisterClassExW
-#define UnregisterClassW lpfnUnregisterClassW
-#define RegisterClipboardFormatW lpfnRegisterClipboardFormatW
-#define GetClipboardFormatNameW lpfnGetClipboardFormatNameW
-#define SetWindowTextW lpfnSetWindowTextW
-#define GetWindowTextW lpfnGetWindowTextW
-#define InsertMenuItemW lpfnInsertMenuItemW
-#define DrawTextW lpfnDrawTextW
-#define DrawStateW lpfnDrawStateW
-
-#ifdef __cplusplus
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index 5a036dc..79b18ac 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -233,44 +233,6 @@ DEF10NAME=$(SHL1TARGET)
DEF10EXPORTFILE=export.exp
.ENDIF
-.IF "$(TESTAPP)" == "salstattest"
-
- CFLAGS+= -DUSE_SAL_STATIC
-
- OBJFILES+=$(OBJ)$/salstattest.obj
-
- APP10TARGET=salstattest
- APP10OBJS=$(OBJ)$/salstattest.obj
- APP10STDLIBS=\
- $(LB)$/asal.lib\
- $(SHELL32LIB)\
- $(USER32LIB)\
- $(COMDLG32LIB)\
- $(ADVAPI32LIB)
-
- APP10DEPN=$(LB)$/asal.lib
-
-.ENDIF # salstattest
-
-.IF "$(TESTAPP)" == "saldyntest"
-
- OBJFILES+=$(OBJ)$/saldyntest.obj
-
- APP10TARGET=saldyntest
- APP10OBJS=$(OBJ)$/saldyntest.obj
- APP10STDLIBS=\
- $(LB)$/isal.lib\
- $(SHELL32LIB)\
- $(USER32LIB)\
- $(COMDLG32LIB)\
- $(ADVAPI32LIB)
-
- APP10DEPN=$(LB)$/isal.lib
-
-.ENDIF # salstattest
-
-
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sal/workben/saldyntest.c b/sal/workben/saldyntest.c
deleted file mode 100644
index 2f82c83..0000000
--- a/sal/workben/saldyntest.c
+++ /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 <systools/win32/shell9x.h>
-#include <systools/win32/kernel9x.h>
-
-int _cdecl main( int argc, char * argv[] )
-{
- BROWSEINFOW bi;
- wchar_t buff[260];
- DWORD dwRet;
-
- bi.hwndOwner = NULL;
- bi.pidlRoot = NULL;
- bi.pszDisplayName = buff;
- bi.lpszTitle = L"Test";
- bi.ulFlags = 0;
- bi.lpfn = NULL;
- bi.lParam = 0;
-
- SHBrowseForFolderW( &bi );
-
- dwRet = GetCanonicalPathW( L"c:\\", buff, 260 );
-
- return(0);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/salstattest.c b/sal/workben/salstattest.c
deleted file mode 100644
index 8c15571..0000000
--- a/sal/workben/salstattest.c
+++ /dev/null
@@ -1,55 +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 <stdio.h>
-#include <systools/win32/shell9x.h>
-#include <systools/win32/kernel9x.h>
-
-int _cdecl main( int argc, char * argv[] )
-{
- BROWSEINFOW bi;
- wchar_t buff[260];
- DWORD dwRet;
-
- bi.hwndOwner = NULL;
- bi.pidlRoot = NULL;
- bi.pszDisplayName = buff;
- bi.lpszTitle = L"Test";
- bi.ulFlags = 0;
- bi.lpfn = NULL;
- bi.lParam = 0;
-
- SHBrowseForFolderW( &bi );
-
- dwRet = GetLongPathNameW( L"c:\\", buff, 260 );
-
- return(0);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list