mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: win32 cleanup

Browse Source
This commit is contained in:
Michael Meeks
2011-09-26 09:47:21 +01:00
committed by Jan Holesovsky
parent ce285da92f
commit 9142f9a1a1
9 changed files with 16 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
View File

@@ -36,22 +36,7 @@
#include "jawt.h"
#if defined assert
#undef assert
#endif
#define assert(X) if (!X) { (*env)->ThrowNew(env, (*env)->FindClass(env, "java/lang/RuntimeException"), "assertion failed"); return 0L;}
#define SYSTEM_WIN32 1
#define SYSTEM_WIN16 2
#define SYSTEM_JAVA 3
#define SYSTEM_MAC 5
#define SYSTEM_XWINDOW 6
#define OLD_PROC_KEY "oldwindowproc"
static LRESULT APIENTRY OpenOfficeWndProc( HWND , UINT , WPARAM , LPARAM );
JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow
(JNIEnv * env, jobject obj_this);
@@ -70,7 +55,6 @@ JNIEXPORT jint JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
return (SYSTEM_WIN32);
}
/*****************************************************************************/
/*
* Class: com_sun_star_beans_LocalOfficeWindow
@@ -83,13 +67,4 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindo
return Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow( env, obj_this );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

9
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
View File

@@ -66,17 +66,11 @@ extern __declspec(dllimport) unsigned char __stdcall JAWT_GetAWT(JNIEnv *, JAWT
#endif
#define SYSTEM_WIN32 1
#define SYSTEM_WIN16 2
#define SYSTEM_JAVA 3
#define SYSTEM_MAC 5
#define SYSTEM_XWINDOW 6
#define OLD_PROC_KEY "oldwindowproc"
static LRESULT APIENTRY OpenOfficeWndProc( HWND , UINT , WPARAM , LPARAM );
/* type must be something like java/lang/RuntimeException
*/
static void ThrowException(JNIEnv * env, char const * type, char const * msg) {
@@ -126,7 +120,6 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
JAWT_DrawingSurface* ds;
JAWT_DrawingSurfaceInfo* dsi;
JAWT_Win32DrawingSurfaceInfo* dsi_win;
HDC hdc;
HWND hWnd;
LONG hFuncPtr;
@@ -152,8 +145,6 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
/* Get the platform-specific drawing info */
dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
hdc = dsi_win->hdc;
hWnd = dsi_win->hwnd;
/* Free the drawing surface info */

2
cui/source/options/optgdlg.cxx
View File

@@ -820,7 +820,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
DELETEZ( pFontAntiAliasing );
Point aPos;
for ( sal_Int32 i = 0; i < SAL_N_ELEMENTS( pMiscOptions ); ++i )
for ( size_t i = 0; i < SAL_N_ELEMENTS( pMiscOptions ); ++i )
{
aPos = pMiscOptions[i]->GetPosPixel( );
aPos.Y() -= nMoveUp;

1
dbaccess/source/ui/dlg/odbcconfig.cxx
View File

@@ -67,6 +67,7 @@
// just to go with calling convention of windows
// so don't touch this
#if defined(WNT)
#undef SQL_API
#define SQL_API __stdcall
// At least under some circumstances, the below #include <odbc/sqlext.h> re-
// defines SQL_API to an empty string, leading to a compiler warning on MSC; to

2
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
View File

@@ -725,7 +725,7 @@ void ExtensionCmdQueue::Thread::execute()
//Needed for use of the service "com.sun.star.system.SystemShellExecute" in
//DialogHelper::openWebBrowser
CoUninitialize();
HRESULT r = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
(void) CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
#endif
for (;;)
{

2
desktop/win32/source/extendloaderenvironment.cxx
View File

@@ -123,7 +123,7 @@ void extendLoaderEnvironment(WCHAR * binPath, WCHAR * iniDirectory) {
WCHAR * padEnd = NULL;
WCHAR env[maxEnv];
DWORD n = GetEnvironmentVariableW(L"PATH", env, maxEnv);
if (n >= maxEnv || n == 0 && GetLastError() != ERROR_ENVVAR_NOT_FOUND) {
if ((n >= maxEnv || n == 0) && GetLastError() != ERROR_ENVVAR_NOT_FOUND) {
fail();
}
env[n] = L'\0';

25
desktop/win32/source/guistdio/guistdio.inc
View File

@@ -52,7 +52,6 @@ DWORD passOutputToConsole(HANDLE readPipe, HANDLE console)
BYTE aBuffer[1024];
DWORD dwRead = 0;
HANDLE hReadPipe = readPipe;
BOOL fSuccess;
DWORD dwWritten;
//Indicates that we read an odd number of bytes. That is, we only read half of the last
@@ -80,7 +79,7 @@ DWORD passOutputToConsole(HANDLE readPipe, HANDLE console)
{
//To test this case, give aBuffer a small odd size, e.g. aBuffer[3]
//The last byte, which is the incomplete wchar_t (half of it), will not be written.
fSuccess = WriteConsoleW( console, aBuffer,
(void) WriteConsoleW( console, aBuffer,
(dwRead - 1) / 2, &dwWritten, NULL );
//Move the last byte to the front of the buffer, so that it is the start of the
@@ -98,7 +97,7 @@ DWORD passOutputToConsole(HANDLE readPipe, HANDLE console)
//when ReadFile is called.
dwToRead = sizeof(aBuffer);
pBuffer = aBuffer;
fSuccess = WriteConsoleW( console,
(void) WriteConsoleW( console,
aBuffer, dwRead / 2, &dwWritten, NULL );
}
}
@@ -122,10 +121,9 @@ DWORD WINAPI OutputThread( LPVOID pParam )
HANDLE hReadPipe = (HANDLE)pParam;
while ( ReadFile( hReadPipe, &aBuffer, sizeof(aBuffer), &dwRead, NULL ) )
{
BOOL fSuccess;
DWORD dwWritten;
fSuccess = WriteFile( GetStdHandle( STD_OUTPUT_HANDLE ), aBuffer, dwRead, &dwWritten, NULL );
(void) WriteFile( GetStdHandle( STD_OUTPUT_HANDLE ), aBuffer, dwRead, &dwWritten, NULL );
}
return 0;
@@ -150,10 +148,9 @@ DWORD WINAPI ErrorThread( LPVOID pParam )
while ( ReadFile( hReadPipe, &aBuffer, sizeof(aBuffer), &dwRead, NULL ) )
{
BOOL fSuccess;
DWORD dwWritten;
fSuccess = WriteFile( GetStdHandle( STD_ERROR_HANDLE ), aBuffer, dwRead, &dwWritten, NULL );
(void) WriteFile( GetStdHandle( STD_ERROR_HANDLE ), aBuffer, dwRead, &dwWritten, NULL );
}
return 0;
@@ -224,10 +221,10 @@ DWORD WINAPI InputThread( LPVOID pParam )
//Do the conversion.
MultiByteToWideChar(
GetConsoleCP(), MB_PRECOMPOSED, readBuf, readAll, wideBuf, sizeWBuf);
BOOL fSuccess;
DWORD dwWritten;
fSuccess = WriteFile( hWritePipe, wideBuf, sizeWBuf * 2, &dwWritten, NULL );
DWORD dwWritten;
(void)WriteFile( hWritePipe, wideBuf, sizeWBuf * 2, &dwWritten, NULL );
delete[] wideBuf;
readAll = 0;
}
@@ -244,10 +241,8 @@ DWORD WINAPI InputThread( LPVOID pParam )
while ( ReadFile( GetStdHandle( STD_INPUT_HANDLE ), &aBuffer, sizeof(aBuffer), &dwRead, NULL ) )
{
BOOL fSuccess;
DWORD dwWritten;
fSuccess = WriteFile( hWritePipe, aBuffer, dwRead, &dwWritten, NULL );
DWORD dwWritten;
(void) WriteFile( hWritePipe, aBuffer, dwRead, &dwWritten, NULL );
}
return 0;

2
desktop/win32/source/setup/setup.cpp
View File

@@ -1675,7 +1675,7 @@ boolean SetupAppX::GetCmdLineParameters( LPTSTR *pCmdLine )
boolean SetupAppX::IsAdmin()
{
PSID aPsidAdmin;
SID_IDENTIFIER_AUTHORITY aAuthority = SECURITY_NT_AUTHORITY;
SID_IDENTIFIER_AUTHORITY aAuthority = { SECURITY_NT_AUTHORITY };
if ( !AllocateAndInitializeSid( &aAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID,
DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0,

4
sw/source/ui/vba/vbasystem.cxx
View File

@@ -101,7 +101,6 @@ uno::Any PrivateProfileStringListener::getValueEvent()
#ifdef WNT
HKEY hBaseKey = NULL;
ByteString sSubKey;
sal_Int32 nBaseKeyIndex = maGroupName.Search('\\');
lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey );
if( hBaseKey != NULL )
{
@@ -148,7 +147,6 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
#ifdef WNT
HKEY hBaseKey = NULL;
ByteString sSubKey;
sal_Int32 nBaseKeyIndex = maGroupName.Search('\\');
lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey );
if( hBaseKey != NULL )
{
@@ -161,7 +159,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
LPCTSTR szValue = TEXT( rtl::OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() );
DWORD cbData = sizeof(TCHAR) * (_tcslen(szValue) + 1);
LPCTSTR lpValueName = TEXT(maKey.GetBuffer());
lResult = RegSetValueEx( hKey, lpValueName, NULL, REG_SZ, (LPBYTE)szValue, cbData );
lResult = RegSetValueEx( hKey, lpValueName, 0 /* Reserved */, REG_SZ, (LPBYTE)szValue, cbData );
RegCloseKey( hKey );
}
}