From 68940e58f305f63e14ae546e96bae4e441c8c93f Mon Sep 17 00:00:00 2001 From: crs Date: Mon, 10 Jun 2002 16:49:46 +0000 Subject: [PATCH] win32 changes. now including windows.h with WIN32_LEAN_AND_MEAN to avoid including some stuff we don't want (like winsock). --- base/CLog.cpp | 82 ++++++++++++++++++++++++++-------- base/CStopwatch.cpp | 63 +++++++++++++++++--------- mt/CCondVar.cpp | 1 + mt/CMutex.cpp | 1 + mt/CThreadRep.h | 1 + net/CNetwork.cpp | 4 +- net/CNetwork.h | 2 - platform/CMSWindowsClipboard.h | 1 + platform/CMSWindowsScreen.h | 1 + platform/CWin32Platform.h | 1 + server/CSynergyHook.h | 1 + server/synrgyhk.dsp | 4 +- 12 files changed, 117 insertions(+), 45 deletions(-) diff --git a/base/CLog.cpp b/base/CLog.cpp index 70c2955e..d36ae24d 100644 --- a/base/CLog.cpp +++ b/base/CLog.cpp @@ -5,10 +5,12 @@ #include #if defined(CONFIG_PLATFORM_WIN32) +#define WIN32_LEAN_AND_MEAN #include #define vsnprintf _vsnprintf #endif +// names of priorities static const char* g_priority[] = { "FATAL", "ERROR", @@ -19,17 +21,29 @@ static const char* g_priority[] = { "DEBUG1", "DEBUG2" }; + +// number of priorities static const int g_numPriority = (int)(sizeof(g_priority) / sizeof(g_priority[0])); + +// the default priority #if defined(NDEBUG) static const int g_defaultMaxPriority = 4; #else static const int g_defaultMaxPriority = 5; #endif -static const int g_maxPriorityLength = 7; // length of longest string + +// length of longest string in g_priority +static const int g_maxPriorityLength = 7; + +// length of suffix string (": ") static const int g_prioritySuffixLength = 2; + +// amount of padded required to fill in the priority prefix static const int g_priorityPad = g_maxPriorityLength + g_prioritySuffixLength; + +// minimum length of a newline sequence static const int g_newlineLength = 2; // @@ -40,7 +54,10 @@ CLog::Outputter CLog::s_outputter = NULL; CLog::Lock CLog::s_lock = &CLog::dummyLock; int CLog::s_maxPriority = -1; -void CLog::print(const char* fmt, ...) +void +CLog::print( + const char* fmt, + ...) { // check if fmt begins with a priority argument int priority = 4; @@ -68,8 +85,12 @@ void CLog::print(const char* fmt, ...) delete[] buffer; } -void CLog::printt(const char* file, int line, - const char* fmt, ...) +void +CLog::printt( + const char* file, + int line, + const char* fmt, + ...) { // check if fmt begins with a priority argument int priority = 4; @@ -110,31 +131,39 @@ void CLog::printt(const char* file, int line, delete[] buffer; } -void CLog::setOutputter(Outputter outputter) +void +CLog::setOutputter( + Outputter outputter) { CHoldLock lock(s_lock); s_outputter = outputter; } -CLog::Outputter CLog::getOutputter() +CLog::Outputter +CLog::getOutputter() { CHoldLock lock(s_lock); return s_outputter; } -void CLog::setLock(Lock newLock) +void +CLog::setLock( + Lock newLock) { CHoldLock lock(s_lock); s_lock = (newLock == NULL) ? dummyLock : newLock; } -CLog::Lock CLog::getLock() +CLog::Lock +CLog::getLock() { CHoldLock lock(s_lock); return (s_lock == dummyLock) ? NULL : s_lock; } -bool CLog::setFilter(const char* maxPriority) +bool +CLog::setFilter( + const char* maxPriority) { if (maxPriority != NULL) { for (int i = 0; i < g_numPriority; ++i) { @@ -148,24 +177,30 @@ bool CLog::setFilter(const char* maxPriority) return true; } -void CLog::setFilter(int maxPriority) +void +CLog::setFilter( + int maxPriority) { CHoldLock lock(s_lock); s_maxPriority = maxPriority; } -int CLog::getFilter() +int +CLog::getFilter() { CHoldLock lock(s_lock); return getMaxPriority(); } -void CLog::dummyLock(bool) +void +CLog::dummyLock( + bool) { // do nothing } -int CLog::getMaxPriority() +int +CLog::getMaxPriority() { CHoldLock lock(s_lock); @@ -177,7 +212,10 @@ int CLog::getMaxPriority() return s_maxPriority; } -void CLog::output(int priority, char* msg) +void +CLog::output( + int priority, + char* msg) { assert(priority >= -1 && priority < g_numPriority); assert(msg != 0); @@ -211,8 +249,13 @@ void CLog::output(int priority, char* msg) } } -char* CLog::vsprint(int pad, char* buffer, int len, - const char* fmt, va_list args) +char* +CLog::vsprint( + int pad, + char* buffer, + int len, + const char* fmt, + va_list args) { assert(len > 0); @@ -240,14 +283,17 @@ char* CLog::vsprint(int pad, char* buffer, int len, static DWORD s_thread = 0; -static BOOL WINAPI CLogSignalHandler(DWORD) +static +BOOL WINAPI +CLogSignalHandler(DWORD) { // terminate cleanly and skip remaining handlers PostThreadMessage(s_thread, WM_QUIT, 0, 0); return TRUE; } -void CLog::openConsole() +void +CLog::openConsole() { static bool s_hasConsole = false; diff --git a/base/CStopwatch.cpp b/base/CStopwatch.cpp index 6a346a7f..5cd61bc7 100644 --- a/base/CStopwatch.cpp +++ b/base/CStopwatch.cpp @@ -5,12 +5,13 @@ // CStopwatch::CStopwatch(bool triggered) : - m_mark(0.0), - m_triggered(triggered), - m_stopped(triggered) + m_mark(0.0), + m_triggered(triggered), + m_stopped(triggered) { - if (!triggered) + if (!triggered) { m_mark = getClock(); + } } CStopwatch::~CStopwatch() @@ -18,7 +19,8 @@ CStopwatch::~CStopwatch() // do nothing } -double CStopwatch::reset() +double +CStopwatch::reset() { if (m_stopped) { const double dt = m_mark; @@ -33,43 +35,52 @@ double CStopwatch::reset() } } -void CStopwatch::stop() +void +CStopwatch::stop() { - if (m_stopped) + if (m_stopped) { return; + } // save the elapsed time m_mark = getClock() - m_mark; m_stopped = true; } -void CStopwatch::start() +void +CStopwatch::start() { m_triggered = false; - if (!m_stopped) + if (!m_stopped) { return; + } // set the mark such that it reports the time elapsed at stop() m_mark = getClock() - m_mark; m_stopped = false; } -void CStopwatch::setTrigger() +void +CStopwatch::setTrigger() { stop(); m_triggered = true; } -double CStopwatch::getTime() +double +CStopwatch::getTime() { if (m_triggered) { const double dt = m_mark; start(); return dt; } - if (m_stopped) + else if (m_stopped) { return m_mark; - return getClock() - m_mark; + } + else { + return getClock() - m_mark; + } } CStopwatch::operator double() @@ -77,16 +88,21 @@ CStopwatch::operator double() return getTime(); } -bool CStopwatch::isStopped() const +bool +CStopwatch::isStopped() const { return m_stopped; } -double CStopwatch::getTime() const +double +CStopwatch::getTime() const { - if (m_stopped) + if (m_stopped) { return m_mark; - return getClock() - m_mark; + } + else { + return getClock() - m_mark; + } } CStopwatch::operator double() const @@ -98,7 +114,8 @@ CStopwatch::operator double() const #include -double CStopwatch::getClock() const +double +CStopwatch::getClock() const { struct timeval t; gettimeofday(&t, NULL); @@ -121,6 +138,7 @@ double CStopwatch::getClock() const #define MMNOMMIO // Multimedia file I/O support #define MMNOMMSYSTEM // General MMSYSTEM functions +#define WIN32_LEAN_AND_MEAN #include #include @@ -150,18 +168,21 @@ CStopwatchInit::CStopwatchInit() else { // load winmm.dll and get timeGetTime s_mmInstance = LoadLibrary("winmm"); - if (s_mmInstance) + if (s_mmInstance) { s_tgt = (PTimeGetTime)GetProcAddress(s_mmInstance, "timeGetTime"); + } } } CStopwatchInit::~CStopwatchInit() { - if (s_mmInstance) + if (s_mmInstance) { FreeLibrary(reinterpret_cast(s_mmInstance)); + } } -double CStopwatch::getClock() const +double +CStopwatch::getClock() const { // get time. we try three ways, in order of descending precision if (s_freq != 0.0) { diff --git a/mt/CCondVar.cpp b/mt/CCondVar.cpp index 9aeb7d8f..104332c6 100644 --- a/mt/CCondVar.cpp +++ b/mt/CCondVar.cpp @@ -167,6 +167,7 @@ bool CCondVarBase::wait( #include "CLock.h" #include "CThreadRep.h" +#define WIN32_LEAN_AND_MEAN #include // diff --git a/mt/CMutex.cpp b/mt/CMutex.cpp index 2d092b8d..0318908a 100644 --- a/mt/CMutex.cpp +++ b/mt/CMutex.cpp @@ -102,6 +102,7 @@ void CMutex::unlock() const #if defined(CONFIG_PLATFORM_WIN32) +#define WIN32_LEAN_AND_MEAN #include void CMutex::init() diff --git a/mt/CThreadRep.h b/mt/CThreadRep.h index 7189752b..b407ae88 100644 --- a/mt/CThreadRep.h +++ b/mt/CThreadRep.h @@ -6,6 +6,7 @@ #if defined(CONFIG_PTHREADS) #include #elif defined(CONFIG_PLATFORM_WIN32) +#define WIN32_LEAN_AND_MEAN #include #endif diff --git a/net/CNetwork.cpp b/net/CNetwork.cpp index 30f68913..4037d9d9 100644 --- a/net/CNetwork.cpp +++ b/net/CNetwork.cpp @@ -125,8 +125,8 @@ UInt16 CNetwork::swaphtons(UInt16 v) { static const union { UInt16 s; UInt8 b[2]; } s_endian = { 0x1234 }; if (s_endian.b[0] == 0x34) - return ((v & 0xff00u) >> 8) | - ((v & 0x00ffu) << 8); + return static_cast( ((v & 0xff00u) >> 8) | + ((v & 0x00ffu) << 8)); else return v; } diff --git a/net/CNetwork.h b/net/CNetwork.h index 1fa01afa..c66d8164 100644 --- a/net/CNetwork.h +++ b/net/CNetwork.h @@ -29,8 +29,6 @@ typedef int ssize_t; # endif #endif -// FIXME -- must handle htonl and ilk when defined as macros - class CNetwork { public: #if defined(CONFIG_PLATFORM_WIN32) diff --git a/platform/CMSWindowsClipboard.h b/platform/CMSWindowsClipboard.h index 7d7d0225..6179ee30 100644 --- a/platform/CMSWindowsClipboard.h +++ b/platform/CMSWindowsClipboard.h @@ -2,6 +2,7 @@ #define CMSWINDOWSCLIPBOARD_H #include "IClipboard.h" +#define WIN32_LEAN_AND_MEAN #include class CMSWindowsClipboard : public IClipboard { diff --git a/platform/CMSWindowsScreen.h b/platform/CMSWindowsScreen.h index 90c00b95..0e54205b 100644 --- a/platform/CMSWindowsScreen.h +++ b/platform/CMSWindowsScreen.h @@ -4,6 +4,7 @@ #include "CMutex.h" #include "IClipboard.h" #include "BasicTypes.h" +#define WIN32_LEAN_AND_MEAN #include class CString; diff --git a/platform/CWin32Platform.h b/platform/CWin32Platform.h index 33f657b9..4300c050 100644 --- a/platform/CWin32Platform.h +++ b/platform/CWin32Platform.h @@ -4,6 +4,7 @@ #include "IPlatform.h" #include "CCondVar.h" #include "CMutex.h" +#define WIN32_LEAN_AND_MEAN #include class CWin32Platform : public IPlatform { diff --git a/server/CSynergyHook.h b/server/CSynergyHook.h index 7d6fa53b..4aefcafc 100644 --- a/server/CSynergyHook.h +++ b/server/CSynergyHook.h @@ -2,6 +2,7 @@ #define CSYNERGYHOOK_H #include "BasicTypes.h" +#define WIN32_LEAN_AND_MEAN #include #if defined(CONFIG_PLATFORM_WIN32) diff --git a/server/synrgyhk.dsp b/server/synrgyhk.dsp index fe82c7cd..1f04aabb 100644 --- a/server/synrgyhk.dsp +++ b/server/synrgyhk.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Intermediate_Dir "ReleaseHook" # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\base" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\base" /I "..\net" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Intermediate_Dir "DebugHook" # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\base" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\base" /I "..\net" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SYNRGYHK_EXPORTS" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32