[Libreoffice-commits] .: 7 commits - crashrep/source desktop/win32 fpicker/source setup_native/source svl/Library_svl.mk svl/source
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Sep 12 05:31:10 PDT 2011
crashrep/source/win32/soreport.cpp | 16 -
desktop/win32/source/lwrapa.cxx | 35 ---
desktop/win32/source/main.h | 1
desktop/win32/source/makefile.mk | 3
desktop/win32/source/rwrapa.cxx | 35 ---
desktop/win32/source/sowrapper.cxx | 5
desktop/win32/source/wrappera.cxx | 34 ---
fpicker/source/win32/filepicker/getfilenamewrapper.cxx | 28 --
setup_native/source/win32/customactions/quickstarter/quickstarter.cxx | 105 ----------
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx | 49 ----
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx | 3
setup_native/source/win32/customactions/shellextensions/postuninstall.cxx | 5
svl/Library_svl.mk | 1
svl/source/svdde/ddeimp.hxx | 1
svl/source/svdde/ddewrap.cxx | 102 ---------
svl/source/svdde/ddewrap.hxx | 27 --
16 files changed, 14 insertions(+), 436 deletions(-)
New commits:
commit 6b7a9a6fd66b3bd72dcf48f93611a4fd47fc1253
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Sep 12 15:27:09 2011 +0300
Drop Win9x code
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index e37913e..af5f725 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -131,21 +131,7 @@ bool g_bLoadReport = false;
static FILE *_xfopen( const _TCHAR *file, const _TCHAR *mode )
{
-#ifdef UNICODE
- if ( (LONG)GetVersion() < 0 )
- {
- char afile[MAX_PATH];
- char amode[16];
-
- WideCharToMultiByte( CP_ACP, 0, file, -1, afile, MAX_PATH, NULL, NULL );
- WideCharToMultiByte( CP_ACP, 0, mode, -1, amode, 16, NULL, NULL );
-
-
- return fopen( afile, amode );
- }
- else
-#endif
- return _tfopen( file, mode );
+ return _tfopen( file, mode );
}
commit 856b8451f8c94ea118b8ca422bb2bfa9e40fe6a9
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Sep 12 15:24:46 2011 +0300
Drop Win9x code
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
index 2f04d31..e301303 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
@@ -16,15 +16,8 @@ namespace /* private */
RegistrationContextInformation::RegistrationContextInformation(MSIHANDLE hMsi, const std::wstring& OpenOfficeExecutablePath) :
msihandle_(hMsi),
- m_IsWin9x(true),
m_OOExecPath(OpenOfficeExecutablePath)
{
- OSVERSIONINFOA osverinfo;
- ZeroMemory(&osverinfo, sizeof(osverinfo));
- osverinfo.dwOSVersionInfoSize = sizeof(osverinfo);
- GetVersionExA(&osverinfo);
-
- m_IsWin9x = (osverinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS);
assert(m_OOExecPath.length());
ExtractOpenOfficeExecNameFromPath();
}
@@ -33,8 +26,6 @@ std::wstring RegistrationContextInformation::GetWordDocumentDisplayName() const
{
std::wstring str;
GetMsiProp(msihandle_, TEXT("STR_MS_WORD_DOCUMENT"), str);
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("Microsoft Word Document");
return str;
}
@@ -69,8 +60,6 @@ std::wstring RegistrationContextInformation::GetWordTemplateDisplayName() const
{
std::wstring str;
GetMsiProp(msihandle_, TEXT("STR_MS_WORD_TEMPLATE"), str);
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("Microsoft Word Template");
return str;
}
@@ -93,8 +82,6 @@ std::wstring RegistrationContextInformation::GetRtfDocumentDisplayName() const
{
std::wstring str;
GetMsiProp(msihandle_, TEXT("STR_RTF_DOCUMENT"), str);
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("Rich Text Document");
return str;
}
@@ -117,8 +104,6 @@ std::wstring RegistrationContextInformation::GetExcelSheetDisplayName() const
{
std::wstring str;
GetMsiProp(msihandle_, TEXT("STR_MS_EXCEL_WORKSHEET"), str);
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("Microsoft Excel Worksheet");
return str;
}
@@ -153,8 +138,6 @@ std::wstring RegistrationContextInformation::GetExcelTemplateDisplayName() const
{
std::wstring str;
GetMsiProp(msihandle_, TEXT("STR_MS_EXCEL_TEMPLATE"), str);
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("Microsoft Excel Template");
return str;
}
@@ -177,8 +160,6 @@ std::wstring RegistrationContextInformation::GetPowerPointDocumentDisplayName()
{
std::wstring str;
GetMsiProp(msihandle_, TEXT("STR_MS_POWERPOINT_PRESENTATION"), str);
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("Microsoft PowerPoint Presentation");
return str;
}
@@ -213,8 +194,6 @@ std::wstring RegistrationContextInformation::GetPowerPointTemplateDisplayName()
{
std::wstring str;
GetMsiProp(msihandle_, TEXT("STR_MS_POWERPOINT_TEMPLATE"), str);
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("Microsoft PowerPoint Template");
return str;
}
@@ -237,8 +216,6 @@ std::wstring RegistrationContextInformation::GetPowerPointShowDisplayName() cons
{
std::wstring str;
GetMsiProp(msihandle_, TEXT("STR_MS_POWERPOINT_SHOW"), str);
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("Microsoft PowerPoint Show");
return str;
}
@@ -271,9 +248,6 @@ std::wstring RegistrationContextInformation::ShellNewCommandDisplayName() const
if(std::wstring::npos != idx)
str.replace(idx, 1, TEXT("&"));
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("&New");
-
return str;
}
@@ -290,9 +264,6 @@ std::wstring RegistrationContextInformation::ShellEditCommandDisplayName() const
if(std::wstring::npos != idx)
str.replace(idx, 1, TEXT("&"));
- if (m_IsWin9x && !IsConvertableToAnsi(str))
- str = TEXT("&Edit");
-
return str;
}
@@ -358,26 +329,6 @@ std::wstring RegistrationContextInformation::GetOpenOfficeCommandline(SHELL_COMM
return cmd_line;
}
-bool RegistrationContextInformation::IsConvertableToAnsi(const std::wstring& String) const
-{
- char buff[MAX_REGKEY_LENGTH_WIN9X];
- BOOL bUsedDefChar = 0;
-
- if (String.length() > 0)
- {
- WideCharToMultiByte(
- CP_ACP,
- WC_COMPOSITECHECK | WC_DEFAULTCHAR,
- String.c_str(),
- static_cast<int>(String.length()),
- buff,
- sizeof(buff),
- NULL,
- &bUsedDefChar);
- }
- return !bUsedDefChar;
-}
-
void RegistrationContextInformation::ExtractOpenOfficeExecNameFromPath()
{
std::wstring::size_type idx = m_OOExecPath.find_last_of(TEXT('\\'));
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
index d3297b1..c27b2a4 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
@@ -159,13 +159,10 @@ public:
OFFICE_APPLICATION OfficeApp) const;
private:
- bool IsConvertableToAnsi(const std::wstring& String) const;
-
void ExtractOpenOfficeExecNameFromPath();
private:
MSIHANDLE msihandle_;
- bool m_IsWin9x;
std::wstring m_OOExecPath;
std::wstring m_OOExecName;
};
commit 42c6acee93439e144f820a3ad7a1e68587d47b60
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Sep 12 15:07:59 2011 +0300
Drop Win9x code
diff --git a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
index fbb4982..f09ecb2 100644
--- a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
@@ -7,7 +7,6 @@
#ifdef _MSC_VER
#pragma warning(pop)
#endif
-#include <tlhelp32.h>
#include <malloc.h>
std::string GetOfficeInstallationPath(MSIHANDLE handle)
@@ -78,103 +77,6 @@ inline bool IsValidHandle( HANDLE handle )
return NULL != handle && INVALID_HANDLE_VALUE != handle;
}
-
-static HANDLE WINAPI _CreateToolhelp32Snapshot( DWORD dwFlags, DWORD th32ProcessID )
-{
- typedef HANDLE (WINAPI *FN_PROC)( DWORD dwFlags, DWORD th32ProcessID );
- static FN_PROC lpProc = NULL;
-
- HANDLE hSnapshot = NULL;
-
- if ( !lpProc )
- {
- HMODULE hLibrary = GetModuleHandle("KERNEL32.DLL");
-
- if ( hLibrary )
- lpProc = reinterpret_cast< FN_PROC >(GetProcAddress( hLibrary, "CreateToolhelp32Snapshot" ));
- }
-
- if ( lpProc )
- hSnapshot = lpProc( dwFlags, th32ProcessID );
-
- return hSnapshot;
-}
-
-static BOOL WINAPI _Process32First( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 )
-{
- typedef BOOL (WINAPI *FN_PROC)( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 );
- static FN_PROC lpProc = NULL;
-
- BOOL fSuccess = FALSE;
-
- if ( !lpProc )
- {
- HMODULE hLibrary = GetModuleHandle("KERNEL32.DLL");
-
- if ( hLibrary )
- lpProc = reinterpret_cast< FN_PROC >(GetProcAddress( hLibrary, "Process32First" ));
- }
-
- if ( lpProc )
- fSuccess = lpProc( hSnapshot, lppe32 );
-
- return fSuccess;
-}
-
-static BOOL WINAPI _Process32Next( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 )
-{
- typedef BOOL (WINAPI *FN_PROC)( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 );
- static FN_PROC lpProc = NULL;
-
- BOOL fSuccess = FALSE;
-
- if ( !lpProc )
- {
- HMODULE hLibrary = GetModuleHandle("KERNEL32.DLL");
-
- if ( hLibrary )
- lpProc = reinterpret_cast< FN_PROC >(GetProcAddress( hLibrary, "Process32Next" ));
- }
-
- if ( lpProc )
- fSuccess = lpProc( hSnapshot, lppe32 );
-
- return fSuccess;
-}
-
-static std::string GetProcessImagePath_9x( DWORD dwProcessId )
-{
- std::string sImagePath;
-
- HANDLE hSnapshot = _CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
-
- if ( IsValidHandle( hSnapshot ) )
- {
- PROCESSENTRY32 pe32 = { 0 };
-
- pe32.dwSize = sizeof(PROCESSENTRY32);
-
- BOOL fSuccess = _Process32First( hSnapshot, &pe32 );
- bool found = false;
-
- while ( !found && fSuccess )
- {
- if ( pe32.th32ProcessID == dwProcessId )
- {
- found = true;
- sImagePath = pe32.szExeFile;
- }
-
- if ( !found )
- fSuccess = _Process32Next( hSnapshot, &pe32 );
- }
-
- CloseHandle( hSnapshot );
- }
-
- return sImagePath;
-}
-
static DWORD WINAPI _GetModuleFileNameExA( HANDLE hProcess, HMODULE hModule, LPSTR lpFileName, DWORD nSize )
{
typedef DWORD (WINAPI *FN_PROC)( HANDLE hProcess, HMODULE hModule, LPSTR lpFileName, DWORD nSize );
@@ -196,7 +98,7 @@ static DWORD WINAPI _GetModuleFileNameExA( HANDLE hProcess, HMODULE hModule, LPS
}
-static std::string GetProcessImagePath_NT( DWORD dwProcessId )
+std::string GetProcessImagePath( DWORD dwProcessId )
{
std::string sImagePath;
@@ -215,9 +117,4 @@ static std::string GetProcessImagePath_NT( DWORD dwProcessId )
return sImagePath;
}
-std::string GetProcessImagePath( DWORD dwProcessId )
-{
- return (LONG)GetVersion() < 0 ? GetProcessImagePath_9x( dwProcessId ) : GetProcessImagePath_NT( dwProcessId );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 416c7533e0e37033b48213bcda0c9c6fb22e226f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Sep 12 15:01:50 2011 +0300
Drop Win9x code
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index 0f1a1a8..c4a20fd 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -83,28 +83,20 @@ namespace /* private */
{
if ( m_nBufLen - 1 > MAX_PATH )
{
- if ( (LONG32)GetVersion() < 0 )
+ DWORD nNewLen = m_nBufLen + 8;
+ wchar_t* pNewBuffer = new wchar_t[nNewLen];
+ if ( m_nBufLen > 3 && m_pBuffer[0] == (wchar_t)'\\' && m_pBuffer[1] == (wchar_t)'\\' )
{
- // this is Win 98/ME branch, such a long path can not be set
- // use the system path as fallback later
+ if ( m_pBuffer[2] == (wchar_t)'?' )
+ _snwprintf( pNewBuffer, nNewLen, L"%s", m_pBuffer );
+ else
+ _snwprintf( pNewBuffer, nNewLen, L"\\\\?\\UNC\\%s", m_pBuffer+2 );
}
else
- {
- DWORD nNewLen = m_nBufLen + 8;
- wchar_t* pNewBuffer = new wchar_t[nNewLen];
- if ( m_nBufLen > 3 && m_pBuffer[0] == (wchar_t)'\\' && m_pBuffer[1] == (wchar_t)'\\' )
- {
- if ( m_pBuffer[2] == (wchar_t)'?' )
- _snwprintf( pNewBuffer, nNewLen, L"%s", m_pBuffer );
- else
- _snwprintf( pNewBuffer, nNewLen, L"\\\\?\\UNC\\%s", m_pBuffer+2 );
- }
- else
- _snwprintf( pNewBuffer, nNewLen, L"\\\\?\\%s", m_pBuffer );
- bDirSet = SetCurrentDirectoryW( pNewBuffer );
+ _snwprintf( pNewBuffer, nNewLen, L"\\\\?\\%s", m_pBuffer );
+ bDirSet = SetCurrentDirectoryW( pNewBuffer );
- delete [] pNewBuffer;
- }
+ delete [] pNewBuffer;
}
else
bDirSet = SetCurrentDirectoryW( m_pBuffer );
commit ac4bc54dc8682430f9b709f54da03e370af55140
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Sep 12 14:59:27 2011 +0300
Drop Win9x code
diff --git a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx
index d4ac16a..02311ed 100644
--- a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx
@@ -138,10 +138,7 @@ extern "C" UINT __stdcall ExecutePostUninstallScript( MSIHANDLE handle )
// MessageBox( NULL, sInfFile.c_str(), "Titel", MB_OK );
- if ( (LONG)GetVersion() < 0 )
- sCommand += _T("setupx.dll");
- else
- sCommand += _T("setupapi.dll");
+ sCommand += _T("setupapi.dll");
sCommand += _T(",InstallHinfSection PostUninstall 132 ");
sCommand += sInfFile;
commit 99d5297d0b97bd3265d3c550134d7aa0e914172f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Sep 12 14:55:28 2011 +0300
Drop Win9x code
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index b091d71..6302f38 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -157,7 +157,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
svl/source/svdde/ddeinf \
svl/source/svdde/ddestrg \
svl/source/svdde/ddesvr \
- svl/source/svdde/ddewrap \
))
$(eval $(call gb_Library_add_linked_libs,svl,\
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index bf9bb50..d3b7d84 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -31,7 +31,6 @@
#include <windows.h>
#include <ddeml.h>
-#include "ddewrap.hxx"
#include <tools/string.hxx>
#include <tools/shl.hxx>
diff --git a/svl/source/svdde/ddewrap.cxx b/svl/source/svdde/ddewrap.cxx
deleted file mode 100644
index 8673dfb..0000000
--- a/svl/source/svdde/ddewrap.cxx
+++ /dev/null
@@ -1,102 +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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-#define _SVTOOLS_SVDDE_DDEWRAP_CXX_
-
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-#include "ddewrap.hxx"
-
-//------------------------------------------------------------------------
-
-HSZ WINAPI DdeCreateStringHandleW_9x( DWORD idInst, LPCWSTR pszString, int )
-{
- HSZ hszResult;
- LPSTR pszANSIString;
- int nSize;
-
- nSize = pszString ? WideCharToMultiByte( CP_ACP, 0, pszString, -1, NULL, 0, NULL, NULL ) : 0;
- pszANSIString = nSize ? (LPSTR)HeapAlloc( GetProcessHeap(), 0, nSize * sizeof(CHAR) ) : NULL;
-
- if ( pszANSIString )
- WideCharToMultiByte( CP_ACP, 0, pszString, -1, pszANSIString, nSize, NULL, NULL );
-
- hszResult = DdeCreateStringHandleA( idInst, pszANSIString, CP_WINANSI );
-
- if ( pszANSIString )
- HeapFree( GetProcessHeap(), 0, pszANSIString );
-
- return hszResult;
-}
-
-//------------------------------------------------------------------------
-
-DWORD WINAPI DdeQueryStringW_9x( DWORD idInst, HSZ hsz, LPWSTR pszString, DWORD cchMax, int )
-{
- DWORD dwResult;
- LPSTR pszANSIString;
-
- pszANSIString = cchMax ? (LPSTR)HeapAlloc( GetProcessHeap(), 0, cchMax * sizeof(CHAR) ) : NULL;
-
- dwResult = DdeQueryStringA( idInst, hsz, pszANSIString, cchMax, CP_WINANSI );
-
- if ( dwResult && pszANSIString )
- MultiByteToWideChar( CP_ACP, 0, pszANSIString, -1, pszString, cchMax );
-
- if ( pszANSIString )
- HeapFree( GetProcessHeap(), 0, pszANSIString );
-
- return dwResult;
-}
-
-//------------------------------------------------------------------------
-
-UINT WINAPI DdeInitializeW_9x( LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes )
-{
- return DdeInitializeA( pidInst, pfnCallback, afCmd, ulRes );
-}
-
-//------------------------------------------------------------------------
-
-#define DEFINE_WAPI_FUNC(func) \
-func##_PROC lpfn##func = (LONG)GetVersion() >= 0 ? func : func##_9x;
-
-
-DEFINE_WAPI_FUNC( DdeCreateStringHandleW );
-DEFINE_WAPI_FUNC( DdeQueryStringW );
-DEFINE_WAPI_FUNC( DdeInitializeW );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/svdde/ddewrap.hxx b/svl/source/svdde/ddewrap.hxx
deleted file mode 100644
index 7594538..0000000
--- a/svl/source/svdde/ddewrap.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef _SVTOOLS_SVDDE_DDEWRAP_HXX_
-#define _SVTOOLS_SVDDE_DDEWRAP_HXX_
-
-#define DECLARE_WAPI_FUNC(func) \
- extern func##_PROC lpfn##func;
-
-typedef HSZ (WINAPI *DdeCreateStringHandleW_PROC)( DWORD idInst, LPCWSTR pszString, int iCodePage );
-typedef DWORD (WINAPI *DdeQueryStringW_PROC)( DWORD idInst, HSZ hsz, LPWSTR pszString, DWORD cchMax, int iCodePage );
-typedef UINT (WINAPI *DdeInitializeW_PROC)( LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes );
-
-
-DECLARE_WAPI_FUNC( DdeCreateStringHandleW );
-DECLARE_WAPI_FUNC( DdeQueryStringW );
-DECLARE_WAPI_FUNC( DdeInitializeW );
-
-
-#ifndef _SVTOOLS_SVDDE_DDEWRAP_CXX_
-#define DdeCreateStringHandleW lpfnDdeCreateStringHandleW
-#define DdeQueryStringW lpfnDdeQueryStringW
-#define DdeInitializeW lpfnDdeInitializeW
-#endif
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2d1454a81b4fd59abadcb57bd53e6f506747350d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Sep 12 14:40:51 2011 +0300
Drop Win9x code
diff --git a/desktop/win32/source/lwrapa.cxx b/desktop/win32/source/lwrapa.cxx
deleted file mode 100644
index eba3059..0000000
--- a/desktop/win32/source/lwrapa.cxx
+++ /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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-#define LOCAL
-#include "wrapper.h"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/main.h b/desktop/win32/source/main.h
index 9e3039d..1beb8b9 100755
--- a/desktop/win32/source/main.h
+++ b/desktop/win32/source/main.h
@@ -5,7 +5,6 @@
extern "C" {
#endif
-int MainA();
int MainW();
#ifdef __cplusplus
diff --git a/desktop/win32/source/makefile.mk b/desktop/win32/source/makefile.mk
index 564ba31..b74ffc8 100755
--- a/desktop/win32/source/makefile.mk
+++ b/desktop/win32/source/makefile.mk
@@ -41,11 +41,8 @@ UWINAPILIB =
# --- Files --------------------------------------------------------
OBJFILES = \
- $(OBJ)$/wrappera.obj \
$(OBJ)$/wrapperw.obj \
- $(OBJ)$/lwrapa.obj \
$(OBJ)$/lwrapw.obj \
- $(OBJ)$/rwrapa.obj \
$(OBJ)$/rwrapw.obj \
$(OBJ)$/sowrapper.obj \
$(OBJ)$/extendloaderenvironment.obj \
diff --git a/desktop/win32/source/rwrapa.cxx b/desktop/win32/source/rwrapa.cxx
deleted file mode 100644
index 080cb4e..0000000
--- a/desktop/win32/source/rwrapa.cxx
+++ /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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-#define REMOTE
-#include "wrapper.h"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/sowrapper.cxx b/desktop/win32/source/sowrapper.cxx
index f62536a..7533679 100644
--- a/desktop/win32/source/sowrapper.cxx
+++ b/desktop/win32/source/sowrapper.cxx
@@ -41,10 +41,7 @@
int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
{
- if ( (LONG)GetVersion() < 0 )
- return MainA();
- else
- return MainW();
+ return MainW();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/wrappera.cxx b/desktop/win32/source/wrappera.cxx
deleted file mode 100644
index 0a74b10..0000000
--- a/desktop/win32/source/wrappera.cxx
+++ /dev/null
@@ -1,34 +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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-#include "wrapper.h"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list