Really set svn:eol-style property.
The last commit used incorrect property name, remove the erroneous property and set the correct svn:eol-style one. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -1,9 +1,9 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: os2/snglinst.cpp
|
||||
// Purpose: implements wxSingleInstanceChecker class for OS/2 using
|
||||
// named mutexes
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by: Lauri Nurmi (modified for OS/2)
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: os2/snglinst.cpp
|
||||
// Purpose: implements wxSingleInstanceChecker class for OS/2 using
|
||||
// named mutexes
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by: Lauri Nurmi (modified for OS/2)
|
||||
// Created: 08.02.2009
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
@@ -11,122 +11,122 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// ============================================================================
|
||||
// declarations
|
||||
// ============================================================================
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_SNGLINST_CHECKER
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/string.h"
|
||||
#include "wx/log.h"
|
||||
#endif //WX_PRECOMP
|
||||
|
||||
#include "wx/snglinst.h"
|
||||
|
||||
#define INCL_DOSSEMAPHORES
|
||||
#define INCL_DOSERRORS
|
||||
#include <os2.h>
|
||||
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxSingleInstanceCheckerImpl: the real implementation class
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxSingleInstanceCheckerImpl
|
||||
{
|
||||
public:
|
||||
wxSingleInstanceCheckerImpl()
|
||||
{
|
||||
m_hMutex = NULL;
|
||||
m_anotherRunning = false;
|
||||
}
|
||||
|
||||
bool Create(const wxString& name)
|
||||
{
|
||||
wxString semName;
|
||||
semName.Printf(wxT("\\SEM32\\%s"), name.c_str());
|
||||
int rc = DosCreateMutexSem(semName.c_str(), &m_hMutex, DC_SEM_SHARED, 1);
|
||||
|
||||
if ( rc == NO_ERROR ) {
|
||||
m_anotherRunning = false;
|
||||
return true;
|
||||
} else if ( rc == ERROR_DUPLICATE_NAME ) {
|
||||
m_anotherRunning = true;
|
||||
return true;
|
||||
} else {
|
||||
m_anotherRunning = false; // we don't know for sure in this case
|
||||
wxLogLastError(wxT("DosCreateMutexSem"));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool IsAnotherRunning() const
|
||||
{
|
||||
return m_anotherRunning;
|
||||
}
|
||||
|
||||
~wxSingleInstanceCheckerImpl()
|
||||
{
|
||||
if ( m_hMutex )
|
||||
{
|
||||
if ( !::DosCloseMutexSem(m_hMutex) )
|
||||
{
|
||||
wxLogLastError(wxT("DosCloseMutexSem"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
// if true, creating the mutex either succeeded
|
||||
// or we know it failed because another app is running.
|
||||
bool m_anotherRunning;
|
||||
|
||||
// the mutex handle, may be NULL
|
||||
HMTX m_hMutex;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)
|
||||
};
|
||||
|
||||
// ============================================================================
|
||||
// wxSingleInstanceChecker implementation
|
||||
// ============================================================================
|
||||
|
||||
bool wxSingleInstanceChecker::Create(const wxString& name,
|
||||
const wxString& WXUNUSED(path))
|
||||
{
|
||||
wxASSERT_MSG( !m_impl,
|
||||
wxT("calling wxSingleInstanceChecker::Create() twice?") );
|
||||
|
||||
// creating unnamed mutex doesn't have the same semantics!
|
||||
wxASSERT_MSG( !name.empty(), wxT("mutex name can't be empty") );
|
||||
|
||||
m_impl = new wxSingleInstanceCheckerImpl;
|
||||
|
||||
return m_impl->Create(name);
|
||||
}
|
||||
|
||||
// declarations
|
||||
// ============================================================================
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_SNGLINST_CHECKER
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/string.h"
|
||||
#include "wx/log.h"
|
||||
#endif //WX_PRECOMP
|
||||
|
||||
#include "wx/snglinst.h"
|
||||
|
||||
#define INCL_DOSSEMAPHORES
|
||||
#define INCL_DOSERRORS
|
||||
#include <os2.h>
|
||||
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxSingleInstanceCheckerImpl: the real implementation class
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxSingleInstanceCheckerImpl
|
||||
{
|
||||
public:
|
||||
wxSingleInstanceCheckerImpl()
|
||||
{
|
||||
m_hMutex = NULL;
|
||||
m_anotherRunning = false;
|
||||
}
|
||||
|
||||
bool Create(const wxString& name)
|
||||
{
|
||||
wxString semName;
|
||||
semName.Printf(wxT("\\SEM32\\%s"), name.c_str());
|
||||
int rc = DosCreateMutexSem(semName.c_str(), &m_hMutex, DC_SEM_SHARED, 1);
|
||||
|
||||
if ( rc == NO_ERROR ) {
|
||||
m_anotherRunning = false;
|
||||
return true;
|
||||
} else if ( rc == ERROR_DUPLICATE_NAME ) {
|
||||
m_anotherRunning = true;
|
||||
return true;
|
||||
} else {
|
||||
m_anotherRunning = false; // we don't know for sure in this case
|
||||
wxLogLastError(wxT("DosCreateMutexSem"));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool IsAnotherRunning() const
|
||||
{
|
||||
return m_anotherRunning;
|
||||
}
|
||||
|
||||
~wxSingleInstanceCheckerImpl()
|
||||
{
|
||||
if ( m_hMutex )
|
||||
{
|
||||
if ( !::DosCloseMutexSem(m_hMutex) )
|
||||
{
|
||||
wxLogLastError(wxT("DosCloseMutexSem"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
// if true, creating the mutex either succeeded
|
||||
// or we know it failed because another app is running.
|
||||
bool m_anotherRunning;
|
||||
|
||||
// the mutex handle, may be NULL
|
||||
HMTX m_hMutex;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)
|
||||
};
|
||||
|
||||
// ============================================================================
|
||||
// wxSingleInstanceChecker implementation
|
||||
// ============================================================================
|
||||
|
||||
bool wxSingleInstanceChecker::Create(const wxString& name,
|
||||
const wxString& WXUNUSED(path))
|
||||
{
|
||||
wxASSERT_MSG( !m_impl,
|
||||
wxT("calling wxSingleInstanceChecker::Create() twice?") );
|
||||
|
||||
// creating unnamed mutex doesn't have the same semantics!
|
||||
wxASSERT_MSG( !name.empty(), wxT("mutex name can't be empty") );
|
||||
|
||||
m_impl = new wxSingleInstanceCheckerImpl;
|
||||
|
||||
return m_impl->Create(name);
|
||||
}
|
||||
|
||||
bool wxSingleInstanceChecker::DoIsAnotherRunning() const
|
||||
{
|
||||
wxCHECK_MSG( m_impl, false, wxT("must call Create() first") );
|
||||
|
||||
return m_impl->IsAnotherRunning();
|
||||
}
|
||||
|
||||
wxSingleInstanceChecker::~wxSingleInstanceChecker()
|
||||
{
|
||||
delete m_impl;
|
||||
}
|
||||
|
||||
#endif // wxUSE_SNGLINST_CHECKER
|
||||
{
|
||||
wxCHECK_MSG( m_impl, false, wxT("must call Create() first") );
|
||||
|
||||
return m_impl->IsAnotherRunning();
|
||||
}
|
||||
|
||||
wxSingleInstanceChecker::~wxSingleInstanceChecker()
|
||||
{
|
||||
delete m_impl;
|
||||
}
|
||||
|
||||
#endif // wxUSE_SNGLINST_CHECKER
|
||||
|
||||
Reference in New Issue
Block a user