diff -c -N -r Ice-3.4.1/cpp/INSTALL.MINGW32 Ice-3.4.1-ported/cpp/INSTALL.MINGW32 *** Ice-3.4.1/cpp/INSTALL.MINGW32 Thu Jan 1 01:00:00 1970 --- Ice-3.4.1-ported/cpp/INSTALL.MINGW32 Tue Oct 19 10:57:33 2010 *************** *** 0 **** --- 1,13 ---- + TDM compiler 4.5.0 + ? prefix/ or /usr/local ? + mcpp-2.7.2 ./configure --enable-mcpplib --prefix= --enable-debug + bzip2 1.0.6 remove chmod, 1 test ( -ds)fails + + http://www.gtk.org/download-windows.html + http://syslog-win32.sourceforge.net + get openssl, I compiled openssl-1.0.0a, ./config --prefix=/usr enable-md2 enable-rc5 experimental-jpake experimental-store -DOPENSSL_NO_CAPIENG + make depend + und + make install + + www.oracle.com, berkeley db, download the zip! (the llinks and eols may lead to compile probs \ No newline at end of file diff -c -N -r Ice-3.4.1/cpp/config/Make.rules.MINGW32_NT-5.1 Ice-3.4.1-ported/cpp/config/Make.rules.MINGW32_NT-5.1 *** Ice-3.4.1/cpp/config/Make.rules.MINGW32_NT-5.1 Thu Jan 1 01:00:00 1970 --- Ice-3.4.1-ported/cpp/config/Make.rules.MINGW32_NT-5.1 Thu Oct 21 11:43:46 2010 *************** *** 0 **** --- 1,111 ---- + # ********************************************************************** + # + # Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved. + # + # This copy of Ice is licensed to you under the terms described in the + # ICE_LICENSE file included in this distribution. + # + # ********************************************************************** + + # + # This file is included by Make.rules when uname is Linux. + # + + USE_SPARC_ASM = irrelevant + MACHINE = $(shell uname -m) + SUSE_i586 = $(shell grep i586 /etc/SuSE-release 2>/dev/null) + + ifneq ($(shell grep 'release 4' /etc/redhat-release 2>/dev/null),) + NPTL_LIB = -L/usr/$(libsubdir)/nptl + NPTL_FLAGS = -I/usr/include/nptl + endif + + # + # Default compiler is c++ (aka g++). + # + ifeq ($(CXX),) + CXX = c++ + endif + + ifeq ($(CXX),g++) + CXX = c++ + endif + + ifeq ($(CXX),c++) + + CXXFLAGS = $(CXXARCHFLAGS) -Wall -D_REENTRANT -I/include -I/usr/include -I$(includedir)/mingw-extra + + ifeq ($(OPTIMIZE),yes) + CXXFLAGS += -O2 -DNDEBUG + else + CXXFLAGS += -g + endif + + # + # C++ run-time libraries, necessary for linking some shared libraries. + # + CXXLIBS = + + mksoname = lib$(1).dll + + mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) + + mklib = ar cr $(1) $(2) + + rpathlink = -Wl,-rpath-link,$(1) + + LDPLATFORMFLAGS = -L/lib -L/usr/lib -Wl,--enable-auto-import + + endif + + ifeq ($(CXX),icpc) + $(warning ===================================================================) + $(warning Intel C++ is currently not supported. The Ice team does not) + $(warning maintain Intel C++ specific portions of the source code or build) + $(warning system. Contact sales@zeroc.com if you wish to sponsor official) + $(warning support.) + $(warning ===================================================================) + CXXFLAGS = -D_REENTRANT + + ifneq ($(GENPIC),no) + CXXFLAGS += -fPIC + endif + + ifeq ($(OPTIMIZE),yes) + CXXFLAGS += -O2 -DNDEBUG + else + CXXFLAGS += -g + endif + + # + # C++ run-time libraries, necessary for linking some shared libraries. + # + CXXLIBS = + + mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) + + mklib = ar cr $(1) $(2) + + rpathlink = -Wl,-rpath-link,$(1) + + endif + + BASELIBS = -lIceUtil + ifneq ($(NPTL_LIB),) + CXXFLAGS += $(NPTL_FLAGS) + BASELIBS := $(NPTL_LIB) $(BASELIBS) + endif + + LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS) + + ifneq ($(QT_HOME),) + QT_FLAGS = -I$(QT_HOME)/include + QT_LIBS = -L$(QT_HOME)/$(libsubdir) -lQtCore -lQtSql + QT_RPATH_LINK = $(call rpathlink,$(QT_HOME)/$(libsubdir)) + endif + + ICEUTIL_OS_LIBS = + ICE_OS_LIBS = -lsyslog -liphlpapi -lws2_32 -lgdi32 + + PLATFORM_HAS_READLINE = yes + diff -c -N -r Ice-3.4.1/cpp/include/IceUtil/Config.h Ice-3.4.1-ported/cpp/include/IceUtil/Config.h *** Ice-3.4.1/cpp/include/IceUtil/Config.h Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/include/IceUtil/Config.h Thu Oct 14 11:12:42 2010 *************** *** 35,41 **** // // 32 or 64 bit mode? // ! #if defined(__linux) && defined(__sparc__) // // We are a linux sparc, which forces 32 bit usr land, no matter // the architecture --- 35,41 ---- // // 32 or 64 bit mode? // ! #if defined(__linux) && defined(__sparc__) && defined(__MINGW32__) // // We are a linux sparc, which forces 32 bit usr land, no matter // the architecture diff -c -N -r Ice-3.4.1/cpp/include/IceUtil/FileUtil.h Ice-3.4.1-ported/cpp/include/IceUtil/FileUtil.h *** Ice-3.4.1/cpp/include/IceUtil/FileUtil.h Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/include/IceUtil/FileUtil.h Thu Oct 14 10:37:03 2010 *************** *** 42,48 **** #if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) typedef struct _stat structstat; #else ! typedef struct _stat64i32 structstat; #endif #ifdef _MSC_VER --- 42,54 ---- #if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) typedef struct _stat structstat; #else ! ! # ifdef __GNUC__ ! typedef struct _stat structstat; ! # else ! typedef struct _stat64i32 structstat; ! # endif ! #endif #ifdef _MSC_VER diff -c -N -r Ice-3.4.1/cpp/include/Slice/Parser.h Ice-3.4.1-ported/cpp/include/Slice/Parser.h *** Ice-3.4.1/cpp/include/Slice/Parser.h Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/include/Slice/Parser.h Thu Oct 14 12:57:13 2010 *************** *** 31,37 **** namespace Slice { ! #if defined(_WIN32) const IceUtil::Int64 Int32Max = 0x7fffffffi64; const IceUtil::Int64 Int32Min = -Int32Max - 1i64; --- 31,37 ---- namespace Slice { ! #if defined(_WIN32) && !defined(__GNUC__) const IceUtil::Int64 Int32Max = 0x7fffffffi64; const IceUtil::Int64 Int32Min = -Int32Max - 1i64; diff -c -N -r Ice-3.4.1/cpp/include/mingw-extra/pdh.h Ice-3.4.1-ported/cpp/include/mingw-extra/pdh.h *** Ice-3.4.1/cpp/include/mingw-extra/pdh.h Thu Jan 1 01:00:00 1970 --- Ice-3.4.1-ported/cpp/include/mingw-extra/pdh.h Wed Oct 20 15:12:09 2010 *************** *** 0 **** --- 1,1357 ---- + /*++ + + Copyright (C) 1996-1999 Microsoft Corporation + + Module Name: + + PDH.H + + Abstract: + + Header file for the Performance Data Helper (PDH) DLL functions. + + --*/ + #ifndef _PDH_H_ + #define _PDH_H_ + + #if _MSC_VER > 1000 + #pragma once + #endif + + #if _MSC_VER >= 1200 + #pragma warning(push) + #endif + #if !defined(__MINGW32__) + #pragma warning ( disable : 4201) + #endif + + // system include files required for datatype and constant definitions + #include // necessary for data types used in this file + #include // necessary for the Detail Level definitions + + #ifdef __cplusplus + extern "C" { + #endif + + typedef LONG PDH_STATUS; + + #define PDH_FUNCTION PDH_STATUS __stdcall + + // version info + #define PDH_CVERSION_WIN40 ((DWORD)(0x0400)) + #define PDH_CVERSION_WIN50 ((DWORD)(0x0500)) + // v1.1 revision of PDH -- basic log functions + // v1.2 of the PDH -- adds variable instance counters + // v1.3 of the PDH -- adds log service control & stubs for NT5/PDH v2 fn's + // v2.0 of the PDH -- is the NT v 5.0 B2 version + #define PDH_VERSION ((DWORD)((PDH_CVERSION_WIN50) + 0x0003)) + + // define severity masks + #define IsSuccessSeverity(ErrorCode) ((((DWORD)(ErrorCode) & (0xC0000000L)) == 0x00000000L) ? TRUE : FALSE) + #define IsInformationalSeverity(ErrorCode) ((((DWORD)(ErrorCode) & (0xC0000000L)) == 0x40000000L) ? TRUE : FALSE) + #define IsWarningSeverity(ErrorCode) ((((DWORD)(ErrorCode) & (0xC0000000L)) == 0x80000000L) ? TRUE : FALSE) + #define IsErrorSeverity(ErrorCode) ((((DWORD)(ErrorCode) & (0xC0000000L)) == 0xC0000000L) ? TRUE : FALSE) + + #define MAX_COUNTER_PATH 256 // Maximum counter path length. This is an obsolute constance. + + #define PDH_MAX_COUNTER_NAME 1024 // Maximum counter name length. + #define PDH_MAX_INSTANCE_NAME 1024 // Maximum counter instance name length. + #define PDH_MAX_COUNTER_PATH 2048 // Maximum full counter path length. + #define PDH_MAX_DATASOURCE_PATH 1024 // MAximum full counter log name length. + + // data type definitions + + typedef HANDLE PDH_HCOUNTER; + typedef HANDLE PDH_HQUERY; + typedef HANDLE PDH_HLOG; + + typedef PDH_HCOUNTER HCOUNTER; + typedef PDH_HQUERY HQUERY; + #ifndef _LMHLOGDEFINED_ + typedef PDH_HLOG HLOG; + #endif + + #ifdef INVALID_HANDLE_VALUE + #undef INVALID_HANDLE_VALUE + #define INVALID_HANDLE_VALUE ((HANDLE)((LONG_PTR)-1)) + #endif + + #define H_REALTIME_DATASOURCE NULL + #define H_WBEM_DATASOURCE INVALID_HANDLE_VALUE + + typedef struct _PDH_RAW_COUNTER { + DWORD CStatus; + FILETIME TimeStamp; + LONGLONG FirstValue; + LONGLONG SecondValue; + DWORD MultiCount; + } PDH_RAW_COUNTER, * PPDH_RAW_COUNTER; + + typedef struct _PDH_RAW_COUNTER_ITEM_A { + LPSTR szName; + PDH_RAW_COUNTER RawValue; + } PDH_RAW_COUNTER_ITEM_A, * PPDH_RAW_COUNTER_ITEM_A; + + typedef struct _PDH_RAW_COUNTER_ITEM_W { + LPWSTR szName; + PDH_RAW_COUNTER RawValue; + } PDH_RAW_COUNTER_ITEM_W, * PPDH_RAW_COUNTER_ITEM_W; + + typedef struct _PDH_FMT_COUNTERVALUE { + DWORD CStatus; + union { + LONG longValue; + double doubleValue; + LONGLONG largeValue; + LPCSTR AnsiStringValue; + LPCWSTR WideStringValue; + }; + } PDH_FMT_COUNTERVALUE, * PPDH_FMT_COUNTERVALUE; + + typedef struct _PDH_FMT_COUNTERVALUE_ITEM_A { + LPSTR szName; + PDH_FMT_COUNTERVALUE FmtValue; + } PDH_FMT_COUNTERVALUE_ITEM_A, * PPDH_FMT_COUNTERVALUE_ITEM_A; + + typedef struct _PDH_FMT_COUNTERVALUE_ITEM_W { + LPWSTR szName; + PDH_FMT_COUNTERVALUE FmtValue; + } PDH_FMT_COUNTERVALUE_ITEM_W, * PPDH_FMT_COUNTERVALUE_ITEM_W; + + typedef struct _PDH_STATISTICS { + DWORD dwFormat; + DWORD count; + PDH_FMT_COUNTERVALUE min; + PDH_FMT_COUNTERVALUE max; + PDH_FMT_COUNTERVALUE mean; + } PDH_STATISTICS, * PPDH_STATISTICS; + + typedef struct _PDH_COUNTER_PATH_ELEMENTS_A { + LPSTR szMachineName; + LPSTR szObjectName; + LPSTR szInstanceName; + LPSTR szParentInstance; + DWORD dwInstanceIndex; + LPSTR szCounterName; + } PDH_COUNTER_PATH_ELEMENTS_A, * PPDH_COUNTER_PATH_ELEMENTS_A; + + typedef struct _PDH_COUNTER_PATH_ELEMENTS_W { + LPWSTR szMachineName; + LPWSTR szObjectName; + LPWSTR szInstanceName; + LPWSTR szParentInstance; + DWORD dwInstanceIndex; + LPWSTR szCounterName; + } PDH_COUNTER_PATH_ELEMENTS_W, * PPDH_COUNTER_PATH_ELEMENTS_W; + + typedef struct _PDH_DATA_ITEM_PATH_ELEMENTS_A { + LPSTR szMachineName; + GUID ObjectGUID; + DWORD dwItemId; + LPSTR szInstanceName; + } PDH_DATA_ITEM_PATH_ELEMENTS_A, * PPDH_DATA_ITEM_PATH_ELEMENTS_A; + + typedef struct _PDH_DATA_ITEM_PATH_ELEMENTS_W { + LPWSTR szMachineName; + GUID ObjectGUID; + DWORD dwItemId; + LPWSTR szInstanceName; + } PDH_DATA_ITEM_PATH_ELEMENTS_W, * PPDH_DATA_ITEM_PATH_ELEMENTS_W; + + typedef struct _PDH_COUNTER_INFO_A { + DWORD dwLength; + DWORD dwType; + DWORD CVersion; + DWORD CStatus; + LONG lScale; + LONG lDefaultScale; + DWORD_PTR dwUserData; + DWORD_PTR dwQueryUserData; + LPSTR szFullPath; + union { + PDH_DATA_ITEM_PATH_ELEMENTS_A DataItemPath; + PDH_COUNTER_PATH_ELEMENTS_A CounterPath; + struct { + LPSTR szMachineName; + LPSTR szObjectName; + LPSTR szInstanceName; + LPSTR szParentInstance; + DWORD dwInstanceIndex; + LPSTR szCounterName; + }; + }; + LPSTR szExplainText; + DWORD DataBuffer[1]; + } PDH_COUNTER_INFO_A, * PPDH_COUNTER_INFO_A; + + typedef struct _PDH_COUNTER_INFO_W { + DWORD dwLength; + DWORD dwType; + DWORD CVersion; + DWORD CStatus; + LONG lScale; + LONG lDefaultScale; + DWORD_PTR dwUserData; + DWORD_PTR dwQueryUserData; + LPWSTR szFullPath; + union { + PDH_DATA_ITEM_PATH_ELEMENTS_W DataItemPath; + PDH_COUNTER_PATH_ELEMENTS_W CounterPath; + struct { + LPWSTR szMachineName; + LPWSTR szObjectName; + LPWSTR szInstanceName; + LPWSTR szParentInstance; + DWORD dwInstanceIndex; + LPWSTR szCounterName; + }; + }; + LPWSTR szExplainText; + DWORD DataBuffer[1]; + } PDH_COUNTER_INFO_W, * PPDH_COUNTER_INFO_W; + + typedef struct _PDH_TIME_INFO { + LONGLONG StartTime; + LONGLONG EndTime; + DWORD SampleCount; + } PDH_TIME_INFO, * PPDH_TIME_INFO; + + typedef struct _PDH_RAW_LOG_RECORD { + DWORD dwStructureSize; + DWORD dwRecordType; + DWORD dwItems; + UCHAR RawBytes[1]; + } PDH_RAW_LOG_RECORD, * PPDH_RAW_LOG_RECORD; + + typedef struct _PDH_LOG_SERVICE_QUERY_INFO_A { + DWORD dwSize; + DWORD dwFlags; + DWORD dwLogQuota; + LPSTR szLogFileCaption; + LPSTR szDefaultDir; + LPSTR szBaseFileName; + DWORD dwFileType; + DWORD dwReserved; + union { + struct { + DWORD PdlAutoNameInterval; + DWORD PdlAutoNameUnits; + LPSTR PdlCommandFilename; + LPSTR PdlCounterList; + DWORD PdlAutoNameFormat; + DWORD PdlSampleInterval; + FILETIME PdlLogStartTime; + FILETIME PdlLogEndTime; + }; + struct { + DWORD TlNumberOfBuffers; + DWORD TlMinimumBuffers; + DWORD TlMaximumBuffers; + DWORD TlFreeBuffers; + DWORD TlBufferSize; + DWORD TlEventsLost; + DWORD TlLoggerThreadId; + DWORD TlBuffersWritten; + DWORD TlLogHandle; + LPSTR TlLogFileName; + }; + }; + } PDH_LOG_SERVICE_QUERY_INFO_A, * PPDH_LOG_SERVICE_QUERY_INFO_A; + + typedef struct _PDH_LOG_SERVICE_QUERY_INFO_W { + DWORD dwSize; + DWORD dwFlags; + DWORD dwLogQuota; + LPWSTR szLogFileCaption; + LPWSTR szDefaultDir; + LPWSTR szBaseFileName; + DWORD dwFileType; + DWORD dwReserved; + union { + struct { + DWORD PdlAutoNameInterval; + DWORD PdlAutoNameUnits; + LPWSTR PdlCommandFilename; + LPWSTR PdlCounterList; + DWORD PdlAutoNameFormat; + DWORD PdlSampleInterval; + FILETIME PdlLogStartTime; + FILETIME PdlLogEndTime; + }; + struct { + DWORD TlNumberOfBuffers; + DWORD TlMinimumBuffers; + DWORD TlMaximumBuffers; + DWORD TlFreeBuffers; + DWORD TlBufferSize; + DWORD TlEventsLost; + DWORD TlLoggerThreadId; + DWORD TlBuffersWritten; + DWORD TlLogHandle; + LPWSTR TlLogFileName; + }; + }; + } PDH_LOG_SERVICE_QUERY_INFO_W, * PPDH_LOG_SERVICE_QUERY_INFO_W; + + // + // Time value constants + // + #define MAX_TIME_VALUE ((LONGLONG) 0x7FFFFFFFFFFFFFFF) + #define MIN_TIME_VALUE ((LONGLONG) 0) + + // function definitions + + PDH_FUNCTION + PdhGetDllVersion( + IN LPDWORD lpdwVersion + ); + + // + // Query Functions + // + + PDH_FUNCTION + PdhOpenQueryW( + IN LPCWSTR szDataSource, + IN DWORD_PTR dwUserData, + IN PDH_HQUERY * phQuery + ); + + PDH_FUNCTION + PdhOpenQueryA( + IN LPCSTR szDataSource, + IN DWORD_PTR dwUserData, + IN PDH_HQUERY * phQuery + ); + + PDH_FUNCTION + PdhAddCounterW( + IN PDH_HQUERY hQuery, + IN LPCWSTR szFullCounterPath, + IN DWORD_PTR dwUserData, + IN PDH_HCOUNTER * phCounter + ); + + PDH_FUNCTION + PdhAddCounterA( + IN PDH_HQUERY hQuery, + IN LPCSTR szFullCounterPath, + IN DWORD_PTR dwUserData, + IN PDH_HCOUNTER * phCounter + ); + + PDH_FUNCTION + PdhRemoveCounter( + IN PDH_HCOUNTER hCounter + ); + + PDH_FUNCTION + PdhCollectQueryData( + IN PDH_HQUERY hQuery + ); + + PDH_FUNCTION + PdhCloseQuery( + IN PDH_HQUERY hQuery + ); + + // + // Counter Functions + // + + PDH_FUNCTION + PdhGetFormattedCounterValue( + IN PDH_HCOUNTER hCounter, + IN DWORD dwFormat, + IN LPDWORD lpdwType, + IN PPDH_FMT_COUNTERVALUE pValue + ); + + PDH_FUNCTION + PdhGetFormattedCounterArrayA( + IN PDH_HCOUNTER hCounter, + IN DWORD dwFormat, + IN LPDWORD lpdwBufferSize, + IN LPDWORD lpdwItemCount, + IN PPDH_FMT_COUNTERVALUE_ITEM_A ItemBuffer + ); + + PDH_FUNCTION + PdhGetFormattedCounterArrayW( + IN PDH_HCOUNTER hCounter, + IN DWORD dwFormat, + IN LPDWORD lpdwBufferSize, + IN LPDWORD lpdwItemCount, + IN PPDH_FMT_COUNTERVALUE_ITEM_W ItemBuffer + ); + + // dwFormat flag values + // + #define PDH_FMT_RAW ((DWORD) 0x00000010) + #define PDH_FMT_ANSI ((DWORD) 0x00000020) + #define PDH_FMT_UNICODE ((DWORD) 0x00000040) + #define PDH_FMT_LONG ((DWORD) 0x00000100) + #define PDH_FMT_DOUBLE ((DWORD) 0x00000200) + #define PDH_FMT_LARGE ((DWORD) 0x00000400) + #define PDH_FMT_NOSCALE ((DWORD) 0x00001000) + #define PDH_FMT_1000 ((DWORD) 0x00002000) + #define PDH_FMT_NODATA ((DWORD) 0x00004000) + #define PDH_FMT_NOCAP100 ((DWORD) 0x00008000) + #define PERF_DETAIL_COSTLY ((DWORD) 0x00010000) + #define PERF_DETAIL_STANDARD ((DWORD) 0x0000FFFF) + + PDH_FUNCTION + PdhGetRawCounterValue( + IN PDH_HCOUNTER hCounter, + IN LPDWORD lpdwType, + IN PPDH_RAW_COUNTER pValue + ); + + PDH_FUNCTION + PdhGetRawCounterArrayA( + IN PDH_HCOUNTER hCounter, + IN LPDWORD lpdwBufferSize, + IN LPDWORD lpdwItemCount, + IN PPDH_RAW_COUNTER_ITEM_A ItemBuffer + ); + + PDH_FUNCTION + PdhGetRawCounterArrayW( + IN PDH_HCOUNTER hCounter, + IN LPDWORD lpdwBufferSize, + IN LPDWORD lpdwItemCount, + IN PPDH_RAW_COUNTER_ITEM_W ItemBuffer + ); + + PDH_FUNCTION + PdhCalculateCounterFromRawValue( + IN PDH_HCOUNTER hCounter, + IN DWORD dwFormat, + IN PPDH_RAW_COUNTER rawValue1, + IN PPDH_RAW_COUNTER rawValue2, + IN PPDH_FMT_COUNTERVALUE fmtValue + ); + + PDH_FUNCTION + PdhComputeCounterStatistics( + IN PDH_HCOUNTER hCounter, + IN DWORD dwFormat, + IN DWORD dwFirstEntry, + IN DWORD dwNumEntries, + IN PPDH_RAW_COUNTER lpRawValueArray, + IN PPDH_STATISTICS data + ); + + PDH_FUNCTION + PdhGetCounterInfoW( + IN PDH_HCOUNTER hCounter, + IN BOOLEAN bRetrieveExplainText, + IN LPDWORD pdwBufferSize, + IN PPDH_COUNTER_INFO_W lpBuffer + ); + + PDH_FUNCTION + PdhGetCounterInfoA( + IN PDH_HCOUNTER hCounter, + IN BOOLEAN bRetrieveExplainText, + IN LPDWORD pdwBufferSize, + IN PPDH_COUNTER_INFO_A lpBuffer + ); + + #define PDH_MAX_SCALE (7L) + #define PDH_MIN_SCALE (-7L) + + PDH_FUNCTION + PdhSetCounterScaleFactor( + IN PDH_HCOUNTER hCounter, + IN LONG lFactor + ); + // + // Browsing and enumeration functions + // + PDH_FUNCTION + PdhConnectMachineW( + IN LPCWSTR szMachineName + ); + + PDH_FUNCTION + PdhConnectMachineA( + IN LPCSTR szMachineName + ); + + PDH_FUNCTION + PdhEnumMachinesW( + IN LPCWSTR szDataSource, + IN LPWSTR mszMachineList, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhEnumMachinesA( + IN LPCSTR szDataSource, + IN LPSTR mszMachineList, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhEnumObjectsW( + IN LPCWSTR szDataSource, + IN LPCWSTR szMachineName, + IN LPWSTR mszObjectList, + IN LPDWORD pcchBufferSize, + IN DWORD dwDetailLevel, + IN BOOL bRefresh + ); + + PDH_FUNCTION + PdhEnumObjectsA( + IN LPCSTR szDataSource, + IN LPCSTR szMachineName, + IN LPSTR mszObjectList, + IN LPDWORD pcchBufferSize, + IN DWORD dwDetailLevel, + IN BOOL bRefresh + ); + + PDH_FUNCTION + PdhEnumObjectItemsW( + IN LPCWSTR szDataSource, + IN LPCWSTR szMachineName, + IN LPCWSTR szObjectName, + IN LPWSTR mszCounterList, + IN LPDWORD pcchCounterListLength, + IN LPWSTR mszInstanceList, + IN LPDWORD pcchInstanceListLength, + IN DWORD dwDetailLevel, + IN DWORD dwFlags + ); + + PDH_FUNCTION + PdhEnumObjectItemsA( + IN LPCSTR szDataSource, + IN LPCSTR szMachineName, + IN LPCSTR szObjectName, + IN LPSTR mszCounterList, + IN LPDWORD pcchCounterListLength, + IN LPSTR mszInstanceList, + IN LPDWORD pcchInstanceListLength, + IN DWORD dwDetailLevel, + IN DWORD dwFlags + ); + + #define PDH_OBJECT_HAS_INSTANCES ((DWORD) 0x00000001) + + PDH_FUNCTION + PdhMakeCounterPathW( + IN PPDH_COUNTER_PATH_ELEMENTS_W pCounterPathElements, + IN LPWSTR szFullPathBuffer, + IN LPDWORD pcchBufferSize, + IN DWORD dwFlags + ); + + PDH_FUNCTION + PdhMakeCounterPathA( + IN PPDH_COUNTER_PATH_ELEMENTS_A pCounterPathElements, + IN LPSTR szFullPathBuffer, + IN LPDWORD pcchBufferSize, + IN DWORD dwFlags + ); + + PDH_FUNCTION + PdhParseCounterPathW( + IN LPCWSTR szFullPathBuffer, + IN PPDH_COUNTER_PATH_ELEMENTS_W pCounterPathElements, + IN LPDWORD pdwBufferSize, + IN DWORD dwFlags + ); + + PDH_FUNCTION + PdhParseCounterPathA( + IN LPCSTR szFullPathBuffer, + IN PPDH_COUNTER_PATH_ELEMENTS_A pCounterPathElements, + IN LPDWORD pdwBufferSize, + IN DWORD dwFlags + ); + + #define PDH_PATH_WBEM_RESULT ((DWORD) 0x00000001) + #define PDH_PATH_WBEM_INPUT ((DWORD) 0x00000002) + + #define PDH_PATH_LANG_FLAGS(LangId, Flags) ((DWORD)(((LangId & 0x0000FFFF) << 16) | (Flags & 0x0000FFFF))) + + PDH_FUNCTION + PdhParseInstanceNameW( + IN LPCWSTR szInstanceString, + IN LPWSTR szInstanceName, + IN LPDWORD pcchInstanceNameLength, + IN LPWSTR szParentName, + IN LPDWORD pcchParentNameLength, + IN LPDWORD lpIndex + ); + + PDH_FUNCTION + PdhParseInstanceNameA( + IN LPCSTR szInstanceString, + IN LPSTR szInstanceName, + IN LPDWORD pcchInstanceNameLength, + IN LPSTR szParentName, + IN LPDWORD pcchParentNameLength, + IN LPDWORD lpIndex + ); + + PDH_FUNCTION + PdhValidatePathW( + IN LPCWSTR szFullPathBuffer + ); + + PDH_FUNCTION + PdhValidatePathA( + IN LPCSTR szFullPathBuffer + ); + + PDH_FUNCTION + PdhGetDefaultPerfObjectW( + IN LPCWSTR szDataSource, + IN LPCWSTR szMachineName, + IN LPWSTR szDefaultObjectName, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhGetDefaultPerfObjectA( + IN LPCSTR szDataSource, + IN LPCSTR szMachineName, + IN LPSTR szDefaultObjectName, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhGetDefaultPerfCounterW( + IN LPCWSTR szDataSource, + IN LPCWSTR szMachineName, + IN LPCWSTR szObjectName, + IN LPWSTR szDefaultCounterName, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhGetDefaultPerfCounterA( + IN LPCSTR szDataSource, + IN LPCSTR szMachineName, + IN LPCSTR szObjectName, + IN LPSTR szDefaultCounterName, + IN LPDWORD pcchBufferSize + ); + + typedef PDH_STATUS (__stdcall * CounterPathCallBack)(DWORD_PTR); + + #if _MSC_VER >= 1200 + #pragma warning(push) + #endif + #if !defined(__MINGW32__) + #pragma warning ( disable : 4214 ) // Disable warning messages + #endif + typedef struct _BrowseDlgConfig_HW { + // Configuration flags + DWORD bIncludeInstanceIndex:1, + bSingleCounterPerAdd:1, + bSingleCounterPerDialog:1, + bLocalCountersOnly:1, + bWildCardInstances:1, + bHideDetailBox:1, + bInitializePath:1, + bDisableMachineSelection:1, + bIncludeCostlyObjects:1, + bShowObjectBrowser:1, + bReserved:22; + + HWND hWndOwner; + PDH_HLOG hDataSource; + LPWSTR szReturnPathBuffer; + DWORD cchReturnPathLength; + CounterPathCallBack pCallBack; + DWORD_PTR dwCallBackArg; + PDH_STATUS CallBackStatus; + DWORD dwDefaultDetailLevel; + LPWSTR szDialogBoxCaption; + } PDH_BROWSE_DLG_CONFIG_HW, * PPDH_BROWSE_DLG_CONFIG_HW; + + typedef struct _BrowseDlgConfig_HA { + // Configuration flags + DWORD bIncludeInstanceIndex:1, + bSingleCounterPerAdd:1, + bSingleCounterPerDialog:1, + bLocalCountersOnly:1, + bWildCardInstances:1, + bHideDetailBox:1, + bInitializePath:1, + bDisableMachineSelection:1, + bIncludeCostlyObjects:1, + bShowObjectBrowser:1, + bReserved:22; + + HWND hWndOwner; + PDH_HLOG hDataSource; + LPSTR szReturnPathBuffer; + DWORD cchReturnPathLength; + CounterPathCallBack pCallBack; + DWORD_PTR dwCallBackArg; + PDH_STATUS CallBackStatus; + DWORD dwDefaultDetailLevel; + LPSTR szDialogBoxCaption; + } PDH_BROWSE_DLG_CONFIG_HA, * PPDH_BROWSE_DLG_CONFIG_HA; + + typedef struct _BrowseDlgConfig_W { + // Configuration flags + DWORD bIncludeInstanceIndex:1, + bSingleCounterPerAdd:1, + bSingleCounterPerDialog:1, + bLocalCountersOnly:1, + bWildCardInstances:1, + bHideDetailBox:1, + bInitializePath:1, + bDisableMachineSelection:1, + bIncludeCostlyObjects:1, + bShowObjectBrowser:1, + bReserved:22; + + HWND hWndOwner; + LPWSTR szDataSource; + LPWSTR szReturnPathBuffer; + DWORD cchReturnPathLength; + CounterPathCallBack pCallBack; + DWORD_PTR dwCallBackArg; + PDH_STATUS CallBackStatus; + DWORD dwDefaultDetailLevel; + LPWSTR szDialogBoxCaption; + } PDH_BROWSE_DLG_CONFIG_W, * PPDH_BROWSE_DLG_CONFIG_W; + + typedef struct _BrowseDlgConfig_A { + // Configuration flags + DWORD bIncludeInstanceIndex:1, + bSingleCounterPerAdd:1, + bSingleCounterPerDialog:1, + bLocalCountersOnly:1, + bWildCardInstances:1, + bHideDetailBox:1, + bInitializePath:1, + bDisableMachineSelection:1, + bIncludeCostlyObjects:1, + bShowObjectBrowser:1, + bReserved:22; + + HWND hWndOwner; + LPSTR szDataSource; + LPSTR szReturnPathBuffer; + DWORD cchReturnPathLength; + CounterPathCallBack pCallBack; + DWORD_PTR dwCallBackArg; + PDH_STATUS CallBackStatus; + DWORD dwDefaultDetailLevel; + LPSTR szDialogBoxCaption; + } PDH_BROWSE_DLG_CONFIG_A, * PPDH_BROWSE_DLG_CONFIG_A; + #if _MSC_VER >= 1200 + #pragma warning(pop) + #else + #if !defined(__MINGW32__) + #pragma warning ( default : 4214 ) + #endif + #endif + + PDH_FUNCTION + PdhBrowseCountersW( + IN PPDH_BROWSE_DLG_CONFIG_W pBrowseDlgData + ); + + PDH_FUNCTION + PdhBrowseCountersA( + IN PPDH_BROWSE_DLG_CONFIG_A pBrowseDlgData + ); + + PDH_FUNCTION + PdhExpandCounterPathW( + IN LPCWSTR szWildCardPath, + IN LPWSTR mszExpandedPathList, + IN LPDWORD pcchPathListLength + ); + + PDH_FUNCTION + PdhExpandCounterPathA( + IN LPCSTR szWildCardPath, + IN LPSTR mszExpandedPathList, + IN LPDWORD pcchPathListLength + ); + + // + // v2.0 functions + // + PDH_FUNCTION + PdhLookupPerfNameByIndexW( + IN LPCWSTR szMachineName, + IN DWORD dwNameIndex, + IN LPWSTR szNameBuffer, + IN LPDWORD pcchNameBufferSize + ); + + PDH_FUNCTION + PdhLookupPerfNameByIndexA( + IN LPCSTR szMachineName, + IN DWORD dwNameIndex, + IN LPSTR szNameBuffer, + IN LPDWORD pcchNameBufferSize + ); + + PDH_FUNCTION + PdhLookupPerfIndexByNameW( + IN LPCWSTR szMachineName, + IN LPCWSTR szNameBuffer, + IN LPDWORD pdwIndex + ); + + PDH_FUNCTION + PdhLookupPerfIndexByNameA( + IN LPCSTR szMachineName, + IN LPCSTR szNameBuffer, + IN LPDWORD pdwIndex + ); + + #define PDH_NOEXPANDCOUNTERS 1 + #define PDH_NOEXPANDINSTANCES 2 + #define PDH_REFRESHCOUNTERS 4 + + PDH_FUNCTION + PdhExpandWildCardPathA( + IN LPCSTR szDataSource, + IN LPCSTR szWildCardPath, + IN LPSTR mszExpandedPathList, + IN LPDWORD pcchPathListLength, + IN DWORD dwFlags + ); + + PDH_FUNCTION + PdhExpandWildCardPathW( + IN LPCWSTR szDataSource, + IN LPCWSTR szWildCardPath, + IN LPWSTR mszExpandedPathList, + IN LPDWORD pcchPathListLength, + IN DWORD dwFlags + ); + + // + // Logging Functions + // + + #define PDH_LOG_READ_ACCESS ((DWORD) 0x00010000) + #define PDH_LOG_WRITE_ACCESS ((DWORD) 0x00020000) + #define PDH_LOG_UPDATE_ACCESS ((DWORD) 0x00040000) + #define PDH_LOG_ACCESS_MASK ((DWORD) 0x000F0000) + + #define PDH_LOG_CREATE_NEW ((DWORD) 0x00000001) + #define PDH_LOG_CREATE_ALWAYS ((DWORD) 0x00000002) + #define PDH_LOG_OPEN_ALWAYS ((DWORD) 0x00000003) + #define PDH_LOG_OPEN_EXISTING ((DWORD) 0x00000004) + #define PDH_LOG_CREATE_MASK ((DWORD) 0x0000000F) + + #define PDH_LOG_OPT_USER_STRING ((DWORD) 0x01000000) + #define PDH_LOG_OPT_CIRCULAR ((DWORD) 0x02000000) + #define PDH_LOG_OPT_MAX_IS_BYTES ((DWORD) 0x04000000) + #define PDH_LOG_OPT_APPEND ((DWORD) 0x08000000) + #define PDH_LOG_OPT_MASK ((DWORD) 0x0F000000) + + #define PDH_LOG_TYPE_UNDEFINED 0 + #define PDH_LOG_TYPE_CSV 1 + #define PDH_LOG_TYPE_TSV 2 + //#define PDH_LOG_TYPE_BINARY 3 // this is the retired binary format + #define PDH_LOG_TYPE_TRACE_KERNEL 4 + #define PDH_LOG_TYPE_TRACE_GENERIC 5 + #define PDH_LOG_TYPE_PERFMON 6 + #define PDH_LOG_TYPE_SQL 7 + #define PDH_LOG_TYPE_BINARY 8 + + PDH_FUNCTION + PdhOpenLogW( + IN LPCWSTR szLogFileName, + IN DWORD dwAccessFlags, + IN LPDWORD lpdwLogType, + IN PDH_HQUERY hQuery, + IN DWORD dwMaxSize, + IN LPCWSTR szUserCaption, + IN PDH_HLOG * phLog + ); + + PDH_FUNCTION + PdhOpenLogA( + IN LPCSTR szLogFileName, + IN DWORD dwAccessFlags, + IN LPDWORD lpdwLogType, + IN PDH_HQUERY hQuery, + IN DWORD dwMaxSize, + IN LPCSTR szUserCaption, + IN PDH_HLOG * phLog + ); + + PDH_FUNCTION + PdhUpdateLogW( + IN PDH_HLOG hLog, + IN LPCWSTR szUserString + ); + + PDH_FUNCTION + PdhUpdateLogA( + IN PDH_HLOG hLog, + IN LPCSTR szUserString + ); + + PDH_FUNCTION + PdhUpdateLogFileCatalog( + IN PDH_HLOG hLog + ); + + PDH_FUNCTION + PdhGetLogFileSize( + IN PDH_HLOG hLog, + IN LONGLONG * llSize + ); + + PDH_FUNCTION + PdhCloseLog( + IN PDH_HLOG hLog, + IN DWORD dwFlags + ); + + #define PDH_FLAGS_CLOSE_QUERY ((DWORD) 0x00000001) + // + // Data source selection dialog + // + #define PDH_FLAGS_FILE_BROWSER_ONLY ((DWORD) 0x00000001) + + PDH_FUNCTION + PdhSelectDataSourceW( + IN HWND hWndOwner, + IN DWORD dwFlags, + IN LPWSTR szDataSource, + IN LPDWORD pcchBufferLength + ); + + PDH_FUNCTION + PdhSelectDataSourceA( + IN HWND hWndOwner, + IN DWORD dwFlags, + IN LPSTR szDataSource, + IN LPDWORD pcchBufferLength + ); + + BOOL + PdhIsRealTimeQuery( + IN PDH_HQUERY hQuery + ); + + PDH_FUNCTION + PdhSetQueryTimeRange( + IN PDH_HQUERY hQuery, + IN PPDH_TIME_INFO pInfo + ); + + PDH_FUNCTION + PdhGetDataSourceTimeRangeW( + IN LPCWSTR szDataSource, + IN LPDWORD pdwNumEntries, + IN PPDH_TIME_INFO pInfo, + IN LPDWORD pdwBufferSize + ); + + PDH_FUNCTION + PdhGetDataSourceTimeRangeA( + IN LPCSTR szDataSource, + IN LPDWORD pdwNumEntries, + IN PPDH_TIME_INFO pInfo, + IN LPDWORD dwBufferSize + ); + + PDH_FUNCTION + PdhCollectQueryDataEx( + IN PDH_HQUERY hQuery, + IN DWORD dwIntervalTime, + IN HANDLE hNewDataEvent + ); + + PDH_FUNCTION + PdhFormatFromRawValue( + IN DWORD dwCounterType, + IN DWORD dwFormat, + IN LONGLONG * pTimeBase, + IN PPDH_RAW_COUNTER pRawValue1, + IN PPDH_RAW_COUNTER pRawValue2, + IN PPDH_FMT_COUNTERVALUE pFmtValue + ); + + PDH_FUNCTION + PdhGetCounterTimeBase( + IN PDH_HCOUNTER hCounter, + IN LONGLONG * pTimeBase + ); + + PDH_FUNCTION + PdhReadRawLogRecord( + IN PDH_HLOG hLog, + IN FILETIME ftRecord, + IN PPDH_RAW_LOG_RECORD pRawLogRecord, + IN LPDWORD pdwBufferLength + ); + + + #define DATA_SOURCE_REGISTRY ((DWORD) 0x00000001) + #define DATA_SOURCE_LOGFILE ((DWORD) 0x00000002) + #define DATA_SOURCE_WBEM ((DWORD) 0x00000004) + + PDH_FUNCTION + PdhSetDefaultRealTimeDataSource( + IN DWORD dwDataSourceId + ); + + // Extended API for WMI event trace logfile format + // + PDH_FUNCTION + PdhBindInputDataSourceW( + IN PDH_HLOG * phDataSource, + IN LPCWSTR LogFileNameList + ); + + PDH_FUNCTION + PdhBindInputDataSourceA( + IN PDH_HLOG * phDataSource, + IN LPCSTR LogFileNameList + ); + + PDH_FUNCTION + PdhOpenQueryH( + IN PDH_HLOG hDataSource, + IN DWORD_PTR dwUserData, + IN PDH_HQUERY * phQuery + ); + + PDH_FUNCTION + PdhEnumMachinesHW( + IN PDH_HLOG hDataSource, + IN LPWSTR mszMachineList, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhEnumMachinesHA( + IN PDH_HLOG hDataSource, + IN LPSTR mszMachineList, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhEnumObjectsHW( + IN PDH_HLOG hDataSource, + IN LPCWSTR szMachineName, + IN LPWSTR mszObjectList, + IN LPDWORD pcchBufferSize, + IN DWORD dwDetailLevel, + IN BOOL bRefresh + ) ; + + PDH_FUNCTION + PdhEnumObjectsHA( + IN PDH_HLOG hDataSource, + IN LPCSTR szMachineName, + IN LPSTR mszObjectList, + IN LPDWORD pcchBufferSize, + IN DWORD dwDetailLevel, + IN BOOL bRefresh + ); + + PDH_FUNCTION + PdhEnumObjectItemsHW( + IN PDH_HLOG hDataSource, + IN LPCWSTR szMachineName, + IN LPCWSTR szObjectName, + IN LPWSTR mszCounterList, + IN LPDWORD pcchCounterListLength, + IN LPWSTR mszInstanceList, + IN LPDWORD pcchInstanceListLength, + IN DWORD dwDetailLevel, + IN DWORD dwFlags + ); + + PDH_FUNCTION + PdhEnumObjectItemsHA( + IN PDH_HLOG hDataSource, + IN LPCSTR szMachineName, + IN LPCSTR szObjectName, + IN LPSTR mszCounterList, + IN LPDWORD pcchCounterListLength, + IN LPSTR mszInstanceList, + IN LPDWORD pcchInstanceListLength, + IN DWORD dwDetailLevel, + IN DWORD dwFlags + ); + + PDH_FUNCTION + PdhExpandWildCardPathHW( + IN PDH_HLOG hDataSource, + IN LPCWSTR szWildCardPath, + IN LPWSTR mszExpandedPathList, + IN LPDWORD pcchPathListLength, + IN DWORD dwFlags + ); + + PDH_FUNCTION + PdhExpandWildCardPathHA( + IN PDH_HLOG hDataSource, + IN LPCSTR szWildCardPath, + IN LPSTR mszExpandedPathList, + IN LPDWORD pcchPathListLength, + IN DWORD dwFlags + ); + + PDH_FUNCTION + PdhGetDataSourceTimeRangeH( + IN PDH_HLOG hDataSource, + IN LPDWORD pdwNumEntries, + IN PPDH_TIME_INFO pInfo, + IN LPDWORD pdwBufferSize + ); + + PDH_FUNCTION + PdhGetDefaultPerfObjectHW( + IN PDH_HLOG hDataSource, + IN LPCWSTR szMachineName, + IN LPWSTR szDefaultObjectName, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhGetDefaultPerfObjectHA( + IN PDH_HLOG hDataSource, + IN LPCSTR szMachineName, + IN LPSTR szDefaultObjectName, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhGetDefaultPerfCounterHW( + IN PDH_HLOG hDataSource, + IN LPCWSTR szMachineName, + IN LPCWSTR szObjectName, + IN LPWSTR szDefaultCounterName, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhGetDefaultPerfCounterHA( + IN PDH_HLOG hDataSource, + IN LPCSTR szMachineName, + IN LPCSTR szObjectName, + IN LPSTR szDefaultCounterName, + IN LPDWORD pcchBufferSize + ); + + PDH_FUNCTION + PdhBrowseCountersHW( + IN PPDH_BROWSE_DLG_CONFIG_HW pBrowseDlgData + ); + + PDH_FUNCTION + PdhBrowseCountersHA( + IN PPDH_BROWSE_DLG_CONFIG_HA pBrowseDlgData + ); + + //Check that a DSN points to a database that contains the correct Perfmon tables. + PDH_FUNCTION + PdhVerifySQLDBW( + IN LPCWSTR szDataSource + ); + + PDH_FUNCTION + PdhVerifySQLDBA( + IN LPCSTR szDataSource + ); + + + //Create the correct perfmon tables in the database pointed to by a DSN. + PDH_FUNCTION + PdhCreateSQLTablesW( + IN LPCWSTR szDataSource + ); + + PDH_FUNCTION + PdhCreateSQLTablesA( + IN LPCSTR szDataSource + ); + + //Return the list of Log set names in the database pointed to by the DSN. + PDH_FUNCTION + PdhEnumLogSetNamesW( + IN LPCWSTR szDataSource, + IN LPWSTR mszDataSetNameList, + IN LPDWORD pcchBufferLength + ); + + PDH_FUNCTION + PdhEnumLogSetNamesA( + IN LPCSTR szDataSource, + IN LPSTR mszDataSetNameList, + IN LPDWORD pcchBufferLength + ); + + //Retrieve the GUID for an open Log Set + PDH_FUNCTION + PdhGetLogSetGUID( + IN PDH_HLOG hLog, + IN GUID * pGuid, + IN int * pRunId + ); + + //Set the RunID for an open Log Set + PDH_FUNCTION + PdhSetLogSetRunID( + IN PDH_HLOG hLog, + IN int RunId + ); + + // + // Unicode/ANSI compatibility section + // + #ifdef UNICODE + #ifndef _UNICODE + #define _UNICODE + #endif + #endif + + #ifdef _UNICODE + #ifndef UNICODE + #define UNICODE + #endif + #endif + + #ifdef UNICODE + // start of UNICODE definitions + #define PdhOpenQuery PdhOpenQueryW + #define PdhAddCounter PdhAddCounterW + #define PdhGetCounterInfo PdhGetCounterInfoW + #define PDH_COUNTER_INFO PDH_COUNTER_INFO_W + #define PPDH_COUNTER_INFO PPDH_COUNTER_INFO_W + #define PdhConnectMachine PdhConnectMachineW + #define PdhEnumMachines PdhEnumMachinesW + #define PdhEnumObjects PdhEnumObjectsW + #define PdhEnumObjectItems PdhEnumObjectItemsW + #define PdhMakeCounterPath PdhMakeCounterPathW + #define PDH_COUNTER_PATH_ELEMENTS PDH_COUNTER_PATH_ELEMENTS_W + #define PPDH_COUNTER_PATH_ELEMENTS PPDH_COUNTER_PATH_ELEMENTS_W + #define PdhParseCounterPath PdhParseCounterPathW + #define PdhParseInstanceName PdhParseInstanceNameW + #define PdhValidatePath PdhValidatePathW + #define PdhGetDefaultPerfObject PdhGetDefaultPerfObjectW + #define PdhGetDefaultPerfCounter PdhGetDefaultPerfCounterW + #define PdhBrowseCounters PdhBrowseCountersW + #define PdhBrowseCountersH PdhBrowseCountersHW + #define PDH_BROWSE_DLG_CONFIG PDH_BROWSE_DLG_CONFIG_W + #define PPDH_BROWSE_DLG_CONFIG PPDH_BROWSE_DLG_CONFIG_W + #define PDH_BROWSE_DLG_CONFIG_H PDH_BROWSE_DLG_CONFIG_HW + #define PPDH_BROWSE_DLG_CONFIG_H PPDH_BROWSE_DLG_CONFIG_HW + #define PdhExpandCounterPath PdhExpandCounterPathW + // v2.0 functions + #define PDH_FMT_COUNTERVALUE_ITEM PDH_FMT_COUNTERVALUE_ITEM_W + #define PPDH_FMT_COUNTERVALUE_ITEM PPDH_FMT_COUNTERVALUE_ITEM_W + #define PDH_RAW_COUNTER_ITEM PDH_RAW_COUNTER_ITEM_W + #define PPDH_RAW_COUNTER_ITEM PPDH_RAW_COUNTER_ITEM_W + #define PdhGetFormattedCounterArray PdhGetFormattedCounterArrayW + #define PdhGetRawCounterArray PdhGetRawCounterArrayW + #define PdhLookupPerfNameByIndex PdhLookupPerfNameByIndexW + #define PdhLookupPerfIndexByName PdhLookupPerfIndexByNameW + #define PdhOpenLog PdhOpenLogW + #define PdhUpdateLog PdhUpdateLogW + #define PdhSelectDataSource PdhSelectDataSourceW + #define PdhGetDataSourceTimeRange PdhGetDataSourceTimeRangeW + #define PDH_LOG_SERVICE_QUERY_INFO PDH_LOG_SERVICE_QUERY_INFO_W + #define PPDH_LOG_SERVICE_QUERY_INFO PPDH_LOG_SERVICE_QUERY_INFO_W + #define PdhLogServiceControl PdhLogServiceControlW + #define PdhLogServiceQuery PdhLogServiceQueryW + #define PdhExpandWildCardPath PdhExpandWildCardPathW + #define PdhBindInputDataSource PdhBindInputDataSourceW + #define PdhEnumMachinesH PdhEnumMachinesHW + #define PdhEnumObjectsH PdhEnumObjectsHW + #define PdhEnumObjectItemsH PdhEnumObjectItemsHW + #define PdhExpandWildCardPathH PdhExpandWildCardPathHW + #define PdhGetDefaultPerfObjectH PdhGetDefaultPerfObjectHW + #define PdhGetDefaultPerfCounterH PdhGetDefaultPerfCounterHW + #define PdhEnumLogSetNames PdhEnumLogSetNamesW + #define PdhCreateSQLTables PdhCreateSQLTablesW + #define PdhVerifySQLDB PdhVerifySQLDBW + + // end of UNICODE definitions + #else + // start of ANSI definitions + #define PdhOpenQuery PdhOpenQueryA + #define PdhAddCounter PdhAddCounterA + #define PdhGetCounterInfo PdhGetCounterInfoA + #define PDH_COUNTER_INFO PDH_COUNTER_INFO_A + #define PPDH_COUNTER_INFO PPDH_COUNTER_INFO_A + #define PdhConnectMachine PdhConnectMachineA + #define PdhEnumMachines PdhEnumMachinesA + #define PdhEnumObjects PdhEnumObjectsA + #define PdhEnumObjectItems PdhEnumObjectItemsA + #define PdhMakeCounterPath PdhMakeCounterPathA + #define PDH_COUNTER_PATH_ELEMENTS PDH_COUNTER_PATH_ELEMENTS_A + #define PPDH_COUNTER_PATH_ELEMENTS PPDH_COUNTER_PATH_ELEMENTS_A + #define PdhParseCounterPath PdhParseCounterPathA + #define PdhParseInstanceName PdhParseInstanceNameA + #define PdhValidatePath PdhValidatePathA + #define PdhGetDefaultPerfObject PdhGetDefaultPerfObjectA + #define PdhGetDefaultPerfCounter PdhGetDefaultPerfCounterA + #define PdhBrowseCounters PdhBrowseCountersA + #define PdhBrowseCountersH PdhBrowseCountersHA + #define PDH_BROWSE_DLG_CONFIG PDH_BROWSE_DLG_CONFIG_A + #define PPDH_BROWSE_DLG_CONFIG PPDH_BROWSE_DLG_CONFIG_A + #define PDH_BROWSE_DLG_CONFIG_H PDH_BROWSE_DLG_CONFIG_HA + #define PPDH_BROWSE_DLG_CONFIG_H PPDH_BROWSE_DLG_CONFIG_HA + #define PdhExpandCounterPath PdhExpandCounterPathA + // v2.0 functions + #define PDH_FMT_COUNTERVALUE_ITEM PDH_FMT_COUNTERVALUE_ITEM_A + #define PPDH_FMT_COUNTERVALUE_ITEM PPDH_FMT_COUNTERVALUE_ITEM_A + #define PDH_RAW_COUNTER_ITEM PDH_RAW_COUNTER_ITEM_A + #define PPDH_RAW_COUNTER_ITEM PPDH_RAW_COUNTER_ITEM_A + #define PdhGetFormattedCounterArray PdhGetFormattedCounterArrayA + #define PdhGetRawCounterArray PdhGetRawCounterArrayA + #define PdhLookupPerfNameByIndex PdhLookupPerfNameByIndexA + #define PdhLookupPerfIndexByName PdhLookupPerfIndexByNameA + #define PdhOpenLog PdhOpenLogA + #define PdhUpdateLog PdhUpdateLogA + #define PdhSelectDataSource PdhSelectDataSourceA + #define PdhGetDataSourceTimeRange PdhGetDataSourceTimeRangeA + #define PDH_LOG_SERVICE_QUERY_INFO PDH_LOG_SERVICE_QUERY_INFO_A + #define PPDH_LOG_SERVICE_QUERY_INFO PPDH_LOG_SERVICE_QUERY_INFO_A + #define PdhLogServiceControl PdhLogServiceControlA + #define PdhLogServiceQuery PdhLogServiceQueryA + #define PdhExpandWildCardPath PdhExpandWildCardPathA + #define PdhBindInputDataSource PdhBindInputDataSourceA + #define PdhEnumMachinesH PdhEnumMachinesHA + #define PdhEnumObjectsH PdhEnumObjectsHA + #define PdhEnumObjectItemsH PdhEnumObjectItemsHA + #define PdhExpandWildCardPathH PdhExpandWildCardPathHA + #define PdhGetDefaultPerfObjectH PdhGetDefaultPerfObjectHA + #define PdhGetDefaultPerfCounterH PdhGetDefaultPerfCounterHA + #define PdhEnumLogSetNames PdhEnumLogSetNamesA + #define PdhCreateSQLTables PdhCreateSQLTablesA + #define PdhVerifySQLDB PdhVerifySQLDBA + + // end of ANSI definitions + #endif // UNICODE + + #if _MSC_VER >= 1200 + #pragma warning(pop) + #else + #if !defined(__MINGW32__) + #pragma warning ( default : 4201 ) + #endif + #endif + + + #ifdef __cplusplus + } + #endif + + #endif //_PDH_H_ diff -c -N -r Ice-3.4.1/cpp/include/mingw-extra/pdhmsg.h Ice-3.4.1-ported/cpp/include/mingw-extra/pdhmsg.h *** Ice-3.4.1/cpp/include/mingw-extra/pdhmsg.h Thu Jan 1 01:00:00 1970 --- Ice-3.4.1-ported/cpp/include/mingw-extra/pdhmsg.h Wed Oct 20 15:07:45 2010 *************** *** 0 **** --- 1,932 ---- + /*++ BUILD Version: 0001 // Increment this if a change has global effects + + Copyright (c) 1996-2001 Microsoft Corporation + + Module Name: + + pdhmsg.h + (generated from pdhmsg.mc) + + Abstract: + + Event message definitions used by routines by PDH.DLL + + Created: + + 6-Feb-96 Bob Watson (a-robw) + + Revision History: + + --*/ + #ifndef _PDH_MSG_H_ + #define _PDH_MSG_H_ + #if _MSC_VER > 1000 + #pragma once + #endif + + // + // PDH DLL messages + // + // + // Success Messages + // + // the Win32 error value ERROR_SUCCESS is used for success returns + // + // MESSAGE NAME FORMAT + // + // PDH_CSTATUS_... messages are data item status message and + // are returned in reference to the status of a data + // item + // PDH_... messages are returned by FUNCTIONS only and + // not used as data item status values + // + // Success Messages + // These messages are normally returned when the operation completed + // successfully. + // + // + // Values are 32 bit values layed out as follows: + // + // 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 + // 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + // +---+-+-+-----------------------+-------------------------------+ + // |Sev|C|R| Facility | Code | + // +---+-+-+-----------------------+-------------------------------+ + // + // where + // + // Sev - is the severity code + // + // 00 - Success + // 01 - Informational + // 10 - Warning + // 11 - Error + // + // C - is the Customer code flag + // + // R - is a reserved bit + // + // Facility - is the facility code + // + // Code - is the facility's status code + // + // + // Define the facility codes + // + + + // + // Define the severity codes + // + #define STATUS_SEVERITY_WARNING 0x2 + #define STATUS_SEVERITY_SUCCESS 0x0 + #define STATUS_SEVERITY_INFORMATIONAL 0x1 + #define STATUS_SEVERITY_ERROR 0x3 + + + // + // MessageId: PDH_CSTATUS_VALID_DATA + // + // MessageText: + // + // The returned data is valid. + // + #define PDH_CSTATUS_VALID_DATA ((DWORD)0x00000000L) + + // + // MessageId: PDH_CSTATUS_NEW_DATA + // + // MessageText: + // + // The return data value is valid and different from the last sample. + // + #define PDH_CSTATUS_NEW_DATA ((DWORD)0x00000001L) + + // + // Informational messages + // + // None + // + // Warning Messages + // These messages are returned when the function has completed + // successfully but the results may be different than expected. + // + // + // MessageId: PDH_CSTATUS_NO_MACHINE + // + // MessageText: + // + // Unable to connect to specified machine or machine is off line. + // + #define PDH_CSTATUS_NO_MACHINE ((DWORD)0x800007D0L) + + // + // MessageId: PDH_CSTATUS_NO_INSTANCE + // + // MessageText: + // + // The specified instance is not present. + // + #define PDH_CSTATUS_NO_INSTANCE ((DWORD)0x800007D1L) + + // + // MessageId: PDH_MORE_DATA + // + // MessageText: + // + // There is more data to return than would fit in the supplied buffer. Allocate + // a larger buffer and call the function again. + // + #define PDH_MORE_DATA ((DWORD)0x800007D2L) + + // + // MessageId: PDH_CSTATUS_ITEM_NOT_VALIDATED + // + // MessageText: + // + // The data item has been added to the query, but has not been validated nor + // accessed. No other status information on this data item is available. + // + #define PDH_CSTATUS_ITEM_NOT_VALIDATED ((DWORD)0x800007D3L) + + // + // MessageId: PDH_RETRY + // + // MessageText: + // + // The selected operation should be retried. + // + #define PDH_RETRY ((DWORD)0x800007D4L) + + // + // MessageId: PDH_NO_DATA + // + // MessageText: + // + // No data to return. + // + #define PDH_NO_DATA ((DWORD)0x800007D5L) + + // + // MessageId: PDH_CALC_NEGATIVE_DENOMINATOR + // + // MessageText: + // + // A counter with a negative denominator value was detected. + // + #define PDH_CALC_NEGATIVE_DENOMINATOR ((DWORD)0x800007D6L) + + // + // MessageId: PDH_CALC_NEGATIVE_TIMEBASE + // + // MessageText: + // + // A counter with a negative timebase value was detected. + // + #define PDH_CALC_NEGATIVE_TIMEBASE ((DWORD)0x800007D7L) + + // + // MessageId: PDH_CALC_NEGATIVE_VALUE + // + // MessageText: + // + // A counter with a negative value was detected. + // + #define PDH_CALC_NEGATIVE_VALUE ((DWORD)0x800007D8L) + + // + // MessageId: PDH_DIALOG_CANCELLED + // + // MessageText: + // + // The user cancelled the dialog box. + // + #define PDH_DIALOG_CANCELLED ((DWORD)0x800007D9L) + + // + // MessageId: PDH_END_OF_LOG_FILE + // + // MessageText: + // + // The end of the log file was reached. + // + #define PDH_END_OF_LOG_FILE ((DWORD)0x800007DAL) + + // + // MessageId: PDH_ASYNC_QUERY_TIMEOUT + // + // MessageText: + // + // Time out while waiting for asynchronous counter collection thread to end. + // + #define PDH_ASYNC_QUERY_TIMEOUT ((DWORD)0x800007DBL) + + // + // MessageId: PDH_CANNOT_SET_DEFAULT_REALTIME_DATASOURCE + // + // MessageText: + // + // Cannot change default real-time data source. There are real-time query + // sessions collecting counter data. + // + #define PDH_CANNOT_SET_DEFAULT_REALTIME_DATASOURCE ((DWORD)0x800007DCL) + + // + // Error Messages + // These messages are returned when the function could not complete + // as requested and some corrective action may be required by the + // the caller or the user. + // + // + // MessageId: PDH_CSTATUS_NO_OBJECT + // + // MessageText: + // + // The specified object is not found on the system. + // + #define PDH_CSTATUS_NO_OBJECT ((DWORD)0xC0000BB8L) + + // + // MessageId: PDH_CSTATUS_NO_COUNTER + // + // MessageText: + // + // The specified counter could not be found. + // + #define PDH_CSTATUS_NO_COUNTER ((DWORD)0xC0000BB9L) + + // + // MessageId: PDH_CSTATUS_INVALID_DATA + // + // MessageText: + // + // The returned data is not valid. + // + #define PDH_CSTATUS_INVALID_DATA ((DWORD)0xC0000BBAL) + + // + // MessageId: PDH_MEMORY_ALLOCATION_FAILURE + // + // MessageText: + // + // A PDH function could not allocate enough temporary memory to complete the + // operation. Close some applications or extend the pagefile and retry the + // function. + // + #define PDH_MEMORY_ALLOCATION_FAILURE ((DWORD)0xC0000BBBL) + + // + // MessageId: PDH_INVALID_HANDLE + // + // MessageText: + // + // The handle is not a valid PDH object. + // + #define PDH_INVALID_HANDLE ((DWORD)0xC0000BBCL) + + // + // MessageId: PDH_INVALID_ARGUMENT + // + // MessageText: + // + // A required argument is missing or incorrect. + // + #define PDH_INVALID_ARGUMENT ((DWORD)0xC0000BBDL) + + // + // MessageId: PDH_FUNCTION_NOT_FOUND + // + // MessageText: + // + // Unable to find the specified function. + // + #define PDH_FUNCTION_NOT_FOUND ((DWORD)0xC0000BBEL) + + // + // MessageId: PDH_CSTATUS_NO_COUNTERNAME + // + // MessageText: + // + // No counter was specified. + // + #define PDH_CSTATUS_NO_COUNTERNAME ((DWORD)0xC0000BBFL) + + // + // MessageId: PDH_CSTATUS_BAD_COUNTERNAME + // + // MessageText: + // + // Unable to parse the counter path. Check the format and syntax of the + // specified path. + // + #define PDH_CSTATUS_BAD_COUNTERNAME ((DWORD)0xC0000BC0L) + + // + // MessageId: PDH_INVALID_BUFFER + // + // MessageText: + // + // The buffer passed by the caller is invalid. + // + #define PDH_INVALID_BUFFER ((DWORD)0xC0000BC1L) + + // + // MessageId: PDH_INSUFFICIENT_BUFFER + // + // MessageText: + // + // The requested data is larger than the buffer supplied. Unable to return the + // requested data. + // + #define PDH_INSUFFICIENT_BUFFER ((DWORD)0xC0000BC2L) + + // + // MessageId: PDH_CANNOT_CONNECT_MACHINE + // + // MessageText: + // + // Unable to connect to the requested machine. + // + #define PDH_CANNOT_CONNECT_MACHINE ((DWORD)0xC0000BC3L) + + // + // MessageId: PDH_INVALID_PATH + // + // MessageText: + // + // The specified counter path could not be interpreted. + // + #define PDH_INVALID_PATH ((DWORD)0xC0000BC4L) + + // + // MessageId: PDH_INVALID_INSTANCE + // + // MessageText: + // + // The instance name could not be read from the specified counter path. + // + #define PDH_INVALID_INSTANCE ((DWORD)0xC0000BC5L) + + // + // MessageId: PDH_INVALID_DATA + // + // MessageText: + // + // The data is not valid. + // + #define PDH_INVALID_DATA ((DWORD)0xC0000BC6L) + + // + // MessageId: PDH_NO_DIALOG_DATA + // + // MessageText: + // + // The dialog box data block was missing or invalid. + // + #define PDH_NO_DIALOG_DATA ((DWORD)0xC0000BC7L) + + // + // MessageId: PDH_CANNOT_READ_NAME_STRINGS + // + // MessageText: + // + // Unable to read the counter and/or explain text from the specified machine. + // + #define PDH_CANNOT_READ_NAME_STRINGS ((DWORD)0xC0000BC8L) + + // + // MessageId: PDH_LOG_FILE_CREATE_ERROR + // + // MessageText: + // + // Unable to create the specified log file. + // + #define PDH_LOG_FILE_CREATE_ERROR ((DWORD)0xC0000BC9L) + + // + // MessageId: PDH_LOG_FILE_OPEN_ERROR + // + // MessageText: + // + // Unable to open the specified log file. + // + #define PDH_LOG_FILE_OPEN_ERROR ((DWORD)0xC0000BCAL) + + // + // MessageId: PDH_LOG_TYPE_NOT_FOUND + // + // MessageText: + // + // The specified log file type has not been installed on this system. + // + #define PDH_LOG_TYPE_NOT_FOUND ((DWORD)0xC0000BCBL) + + // + // MessageId: PDH_NO_MORE_DATA + // + // MessageText: + // + // No more data is available. + // + #define PDH_NO_MORE_DATA ((DWORD)0xC0000BCCL) + + // + // MessageId: PDH_ENTRY_NOT_IN_LOG_FILE + // + // MessageText: + // + // The specified record was not found in the log file. + // + #define PDH_ENTRY_NOT_IN_LOG_FILE ((DWORD)0xC0000BCDL) + + // + // MessageId: PDH_DATA_SOURCE_IS_LOG_FILE + // + // MessageText: + // + // The specified data source is a log file. + // + #define PDH_DATA_SOURCE_IS_LOG_FILE ((DWORD)0xC0000BCEL) + + // + // MessageId: PDH_DATA_SOURCE_IS_REAL_TIME + // + // MessageText: + // + // The specified data source is the current activity. + // + #define PDH_DATA_SOURCE_IS_REAL_TIME ((DWORD)0xC0000BCFL) + + // + // MessageId: PDH_UNABLE_READ_LOG_HEADER + // + // MessageText: + // + // The log file header could not be read. + // + #define PDH_UNABLE_READ_LOG_HEADER ((DWORD)0xC0000BD0L) + + // + // MessageId: PDH_FILE_NOT_FOUND + // + // MessageText: + // + // Unable to find the specified file. + // + #define PDH_FILE_NOT_FOUND ((DWORD)0xC0000BD1L) + + // + // MessageId: PDH_FILE_ALREADY_EXISTS + // + // MessageText: + // + // There is already a file with the specified file name. + // + #define PDH_FILE_ALREADY_EXISTS ((DWORD)0xC0000BD2L) + + // + // MessageId: PDH_NOT_IMPLEMENTED + // + // MessageText: + // + // The function referenced has not been implemented. + // + #define PDH_NOT_IMPLEMENTED ((DWORD)0xC0000BD3L) + + // + // MessageId: PDH_STRING_NOT_FOUND + // + // MessageText: + // + // Unable to find the specified string in the list of performance name and + // explain text strings. + // + #define PDH_STRING_NOT_FOUND ((DWORD)0xC0000BD4L) + + // + // MessageId: PDH_UNABLE_MAP_NAME_FILES + // + // MessageText: + // + // Unable to map to the performance counter name data files. The data + // will be read from the registry and stored locally. + // + #define PDH_UNABLE_MAP_NAME_FILES ((DWORD)0x80000BD5L) + + // + // MessageId: PDH_UNKNOWN_LOG_FORMAT + // + // MessageText: + // + // The format of the specified log file is not recognized by the PDH DLL. + // + #define PDH_UNKNOWN_LOG_FORMAT ((DWORD)0xC0000BD6L) + + // + // MessageId: PDH_UNKNOWN_LOGSVC_COMMAND + // + // MessageText: + // + // The specified Log Service command value is not recognized. + // + #define PDH_UNKNOWN_LOGSVC_COMMAND ((DWORD)0xC0000BD7L) + + // + // MessageId: PDH_LOGSVC_QUERY_NOT_FOUND + // + // MessageText: + // + // The specified Query from the Log Service could not be found or could not + // be opened. + // + #define PDH_LOGSVC_QUERY_NOT_FOUND ((DWORD)0xC0000BD8L) + + // + // MessageId: PDH_LOGSVC_NOT_OPENED + // + // MessageText: + // + // The Performance Data Log Service key could not be opened. This may be due + // to insufficient privilege or because the service has not been installed. + // + #define PDH_LOGSVC_NOT_OPENED ((DWORD)0xC0000BD9L) + + // + // MessageId: PDH_WBEM_ERROR + // + // MessageText: + // + // An error occurred while accessing the WBEM data store. + // + #define PDH_WBEM_ERROR ((DWORD)0xC0000BDAL) + + // + // MessageId: PDH_ACCESS_DENIED + // + // MessageText: + // + // Unable to access the desired machine or service. Check the permissions and + // authentication of the log service or the interactive user session against + // those on the machine or service being monitored. + // + #define PDH_ACCESS_DENIED ((DWORD)0xC0000BDBL) + + // + // MessageId: PDH_LOG_FILE_TOO_SMALL + // + // MessageText: + // + // The maximum log file size specified is too small to log the selected counters. + // No data will be recorded in this log file. Specify a smaller set of counters + // to log or a larger file size and retry this call. + // + #define PDH_LOG_FILE_TOO_SMALL ((DWORD)0xC0000BDCL) + + // + // MessageId: PDH_INVALID_DATASOURCE + // + // MessageText: + // + // Cannot connect to ODBC DataSource Name. + // + #define PDH_INVALID_DATASOURCE ((DWORD)0xC0000BDDL) + + // + // MessageId: PDH_INVALID_SQLDB + // + // MessageText: + // + // SQL Database does not contain a valid set of tables for Perfmon, use PdhCreateSQLTables. + // + #define PDH_INVALID_SQLDB ((DWORD)0xC0000BDEL) + + // + // MessageId: PDH_NO_COUNTERS + // + // MessageText: + // + // No counters were found for this Perfmon SQL Log Set. + // + #define PDH_NO_COUNTERS ((DWORD)0xC0000BDFL) + + // + // MessageId: PDH_SQL_ALLOC_FAILED + // + // MessageText: + // + // Call to SQLAllocStmt failed with %1. + // + #define PDH_SQL_ALLOC_FAILED ((DWORD)0xC0000BE0L) + + // + // MessageId: PDH_SQL_ALLOCCON_FAILED + // + // MessageText: + // + // Call to SQLAllocConnect failed with %1. + // + #define PDH_SQL_ALLOCCON_FAILED ((DWORD)0xC0000BE1L) + + // + // MessageId: PDH_SQL_EXEC_DIRECT_FAILED + // + // MessageText: + // + // Call to SQLExecDirect failed with %1. + // + #define PDH_SQL_EXEC_DIRECT_FAILED ((DWORD)0xC0000BE2L) + + // + // MessageId: PDH_SQL_FETCH_FAILED + // + // MessageText: + // + // Call to SQLFetch failed with %1. + // + #define PDH_SQL_FETCH_FAILED ((DWORD)0xC0000BE3L) + + // + // MessageId: PDH_SQL_ROWCOUNT_FAILED + // + // MessageText: + // + // Call to SQLRowCount failed with %1. + // + #define PDH_SQL_ROWCOUNT_FAILED ((DWORD)0xC0000BE4L) + + // + // MessageId: PDH_SQL_MORE_RESULTS_FAILED + // + // MessageText: + // + // Call to SQLMoreResults failed with %1. + // + #define PDH_SQL_MORE_RESULTS_FAILED ((DWORD)0xC0000BE5L) + + // + // MessageId: PDH_SQL_CONNECT_FAILED + // + // MessageText: + // + // Call to SQLConnect failed with %1. + // + #define PDH_SQL_CONNECT_FAILED ((DWORD)0xC0000BE6L) + + // + // MessageId: PDH_SQL_BIND_FAILED + // + // MessageText: + // + // Call to SQLBindCol failed with %1. + // + #define PDH_SQL_BIND_FAILED ((DWORD)0xC0000BE7L) + + // + // MessageId: PDH_CANNOT_CONNECT_WMI_SERVER + // + // MessageText: + // + // Unable to connect to the WMI server on requested machine. + // + #define PDH_CANNOT_CONNECT_WMI_SERVER ((DWORD)0xC0000BE8L) + + // + // MessageId: PDH_PLA_COLLECTION_ALREADY_RUNNING + // + // MessageText: + // + // Collection "%1!s!" is already running. + // + #define PDH_PLA_COLLECTION_ALREADY_RUNNING ((DWORD)0xC0000BE9L) + + // + // MessageId: PDH_PLA_ERROR_SCHEDULE_OVERLAP + // + // MessageText: + // + // The specified start time is after the end time. + // + #define PDH_PLA_ERROR_SCHEDULE_OVERLAP ((DWORD)0xC0000BEAL) + + // + // MessageId: PDH_PLA_COLLECTION_NOT_FOUND + // + // MessageText: + // + // Collection "%1!s!" does not exist. + // + #define PDH_PLA_COLLECTION_NOT_FOUND ((DWORD)0xC0000BEBL) + + // + // MessageId: PDH_PLA_ERROR_SCHEDULE_ELAPSED + // + // MessageText: + // + // The specified end time has already elapsed. + // + #define PDH_PLA_ERROR_SCHEDULE_ELAPSED ((DWORD)0xC0000BECL) + + // + // MessageId: PDH_PLA_ERROR_NOSTART + // + // MessageText: + // + // Collection "%1!s!" did not start, check the application event log for any errors. + // + #define PDH_PLA_ERROR_NOSTART ((DWORD)0xC0000BEDL) + + // + // MessageId: PDH_PLA_ERROR_ALREADY_EXISTS + // + // MessageText: + // + // Collection "%1!s!" already exists. + // + #define PDH_PLA_ERROR_ALREADY_EXISTS ((DWORD)0xC0000BEEL) + + // + // MessageId: PDH_PLA_ERROR_TYPE_MISMATCH + // + // MessageText: + // + // There is a mismatch in the settings type. + // + #define PDH_PLA_ERROR_TYPE_MISMATCH ((DWORD)0xC0000BEFL) + + // + // MessageId: PDH_PLA_ERROR_FILEPATH + // + // MessageText: + // + // The information specified does not resolve to a valid path name. + // + #define PDH_PLA_ERROR_FILEPATH ((DWORD)0xC0000BF0L) + + // + // MessageId: PDH_PLA_SERVICE_ERROR + // + // MessageText: + // + // The "Performance Logs & Alerts" service did not respond. + // + #define PDH_PLA_SERVICE_ERROR ((DWORD)0xC0000BF1L) + + // + // MessageId: PDH_PLA_VALIDATION_ERROR + // + // MessageText: + // + // The information passed is not valid. + // + #define PDH_PLA_VALIDATION_ERROR ((DWORD)0xC0000BF2L) + + // + // MessageId: PDH_PLA_VALIDATION_WARNING + // + // MessageText: + // + // The information passed is not valid. + // + #define PDH_PLA_VALIDATION_WARNING ((DWORD)0x80000BF3L) + + // + // MessageId: PDH_PLA_ERROR_NAME_TOO_LONG + // + // MessageText: + // + // The name supplied is too long. + // + #define PDH_PLA_ERROR_NAME_TOO_LONG ((DWORD)0xC0000BF4L) + + // + // MessageId: PDH_INVALID_SQL_LOG_FORMAT + // + // MessageText: + // + // SQL log format is incorrect. Correct format is "SQL:!". + // + #define PDH_INVALID_SQL_LOG_FORMAT ((DWORD)0xC0000BF5L) + + // + // MessageId: PDH_COUNTER_ALREADY_IN_QUERY + // + // MessageText: + // + // Performance counter in PdhAddCounter() call has already been added + // in the performance query. This counter is ignored. + // + #define PDH_COUNTER_ALREADY_IN_QUERY ((DWORD)0xC0000BF6L) + + // + // MessageId: PDH_BINARY_LOG_CORRUPT + // + // MessageText: + // + // Unable to read counter information and data from input binary log files. + // + #define PDH_BINARY_LOG_CORRUPT ((DWORD)0xC0000BF7L) + + // + // MessageId: PDH_LOG_SAMPLE_TOO_SMALL + // + // MessageText: + // + // At least one of the input binary log files contain fewer than two data samples. + // + #define PDH_LOG_SAMPLE_TOO_SMALL ((DWORD)0xC0000BF8L) + + // + // MessageId: PDH_OS_LATER_VERSION + // + // MessageText: + // + // The version of the operating system on the computer named %1 is later than that on the local computer. This operation is not available from the local computer. + // + #define PDH_OS_LATER_VERSION ((DWORD)0xC0000BF9L) + + // + // MessageId: PDH_OS_EARLIER_VERSION + // + // MessageText: + // + // %1 supports %2 or later. Check the operating system version on the computer named %3. + // + #define PDH_OS_EARLIER_VERSION ((DWORD)0xC0000BFAL) + + // + // MessageId: PDH_INCORRECT_APPEND_TIME + // + // MessageText: + // + // The output file must contain earlier data than the file to be appended. + // + #define PDH_INCORRECT_APPEND_TIME ((DWORD)0xC0000BFBL) + + // + // MessageId: PDH_UNMATCHED_APPEND_COUNTER + // + // MessageText: + // + // Both files must have identical counters in order to append. + // + #define PDH_UNMATCHED_APPEND_COUNTER ((DWORD)0xC0000BFCL) + + // + // MessageId: PDH_SQL_ALTER_DETAIL_FAILED + // + // MessageText: + // + // Cannot alter CounterDetail table layout in SQL database. + // + #define PDH_SQL_ALTER_DETAIL_FAILED ((DWORD)0xC0000BFDL) + + // + // MessageId: PDH_QUERY_PERF_DATA_TIMEOUT + // + // MessageText: + // + // System is busy. Timeout when collecting counter data. Please retry later or increase "CollectTime" registry value. + // + #define PDH_QUERY_PERF_DATA_TIMEOUT ((DWORD)0xC0000BFEL) + + typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { + RelationProcessorCore, + RelationNumaNode, + RelationCache, + RelationProcessorPackage, + RelationGroup, + RelationAll = 0xffff + } LOGICAL_PROCESSOR_RELATIONSHIP; + + typedef enum _PROCESSOR_CACHE_TYPE { + CacheUnified, + CacheInstruction, + CacheData, + CacheTrace + } PROCESSOR_CACHE_TYPE; + + typedef struct _CACHE_DESCRIPTOR { + BYTE Level; + BYTE Associativity; + WORD LineSize; + DWORD Size; + PROCESSOR_CACHE_TYPE Type; + } CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; + + typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION { + ULONG_PTR ProcessorMask; + LOGICAL_PROCESSOR_RELATIONSHIP Relationship; + union { + struct { + BYTE Flags; + } ProcessorCore; + struct { + DWORD NodeNumber; + } NumaNode; + CACHE_DESCRIPTOR Cache; + ULONGLONG Reserved[2]; + } ; + } SYSTEM_LOGICAL_PROCESSOR_INFORMATION, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION; + + #endif //_PDH_MSG_H_ + // end of generated file diff -c -N -r Ice-3.4.1/cpp/src/Freeze/Makefile Ice-3.4.1-ported/cpp/src/Freeze/Makefile *** Ice-3.4.1/cpp/src/Freeze/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Freeze/Makefile Wed Oct 20 10:39:21 2010 *************** *** 95,105 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 95,105 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/FreezeScript/DumpDB.cpp Ice-3.4.1-ported/cpp/src/FreezeScript/DumpDB.cpp *** Ice-3.4.1/cpp/src/FreezeScript/DumpDB.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/FreezeScript/DumpDB.cpp Wed Oct 20 11:07:58 2010 *************** *** 630,636 **** } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 630,636 ---- } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/FreezeScript/transformdb.cpp Ice-3.4.1-ported/cpp/src/FreezeScript/transformdb.cpp *** Ice-3.4.1/cpp/src/FreezeScript/transformdb.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/FreezeScript/transformdb.cpp Wed Oct 20 10:55:43 2010 *************** *** 929,935 **** } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 929,935 ---- } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/Glacier2/Glacier2Router.cpp Ice-3.4.1-ported/cpp/src/Glacier2/Glacier2Router.cpp *** Ice-3.4.1/cpp/src/Glacier2/Glacier2Router.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Glacier2/Glacier2Router.cpp Wed Oct 20 11:19:55 2010 *************** *** 613,619 **** } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 613,619 ---- } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/Glacier2Lib/Makefile Ice-3.4.1-ported/cpp/src/Glacier2Lib/Makefile *** Ice-3.4.1/cpp/src/Glacier2Lib/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Glacier2Lib/Makefile Wed Oct 20 11:23:31 2010 *************** *** 46,56 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 46,56 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/Ice/Makefile Ice-3.4.1-ported/cpp/src/Ice/Makefile *** Ice-3.4.1/cpp/src/Ice/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Ice/Makefile Fri Oct 15 16:20:25 2010 *************** *** 164,174 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 164,174 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/Ice/Network.cpp Ice-3.4.1-ported/cpp/src/Ice/Network.cpp *** Ice-3.4.1/cpp/src/Ice/Network.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Ice/Network.cpp Fri Oct 15 11:49:18 2010 *************** *** 36,42 **** # include # include # include ! # include #else # include # include --- 36,42 ---- # include # include # include ! # include #else # include # include *************** *** 946,952 **** } void ! IceInternal::setMcastGroup(SOCKET fd, const struct sockaddr_storage& group, const string& interface) { int rc; if(group.ss_family == AF_INET) --- 946,952 ---- } void ! IceInternal::setMcastGroup(SOCKET fd, const struct sockaddr_storage& group, const string& p_interface) { int rc; if(group.ss_family == AF_INET) *************** *** 954,968 **** struct ip_mreq mreq; mreq.imr_multiaddr = reinterpret_cast(&group)->sin_addr; mreq.imr_interface.s_addr = INADDR_ANY; ! if(interface.size() > 0) { // // First see if it is the interface name. If not check if IP Address. // ! mreq.imr_interface = getInterfaceAddress(interface); if(mreq.imr_interface.s_addr == INADDR_ANY) { ! struct sockaddr_storage addr = getAddressForServer(interface, 0, EnableIPv4); mreq.imr_interface = reinterpret_cast(&addr)->sin_addr; } } --- 954,968 ---- struct ip_mreq mreq; mreq.imr_multiaddr = reinterpret_cast(&group)->sin_addr; mreq.imr_interface.s_addr = INADDR_ANY; ! if(p_interface.size() > 0) { // // First see if it is the interface name. If not check if IP Address. // ! mreq.imr_interface = getInterfaceAddress(p_interface); if(mreq.imr_interface.s_addr == INADDR_ANY) { ! struct sockaddr_storage addr = getAddressForServer(p_interface, 0, EnableIPv4); mreq.imr_interface = reinterpret_cast(&addr)->sin_addr; } } *************** *** 973,987 **** struct ipv6_mreq mreq; mreq.ipv6mr_multiaddr = reinterpret_cast(&group)->sin6_addr; mreq.ipv6mr_interface = 0; ! if(interface.size() != 0) { // // First check if it is the interface name. If not check if index. // ! mreq.ipv6mr_interface = getInterfaceIndex(interface); if(mreq.ipv6mr_interface == 0) { ! istringstream p(interface); if(!(p >> mreq.ipv6mr_interface) || !p.eof()) { closeSocketNoThrow(fd); --- 973,987 ---- struct ipv6_mreq mreq; mreq.ipv6mr_multiaddr = reinterpret_cast(&group)->sin6_addr; mreq.ipv6mr_interface = 0; ! if(p_interface.size() != 0) { // // First check if it is the interface name. If not check if index. // ! mreq.ipv6mr_interface = getInterfaceIndex(p_interface); if(mreq.ipv6mr_interface == 0) { ! istringstream p(p_interface); if(!(p >> mreq.ipv6mr_interface) || !p.eof()) { closeSocketNoThrow(fd); *************** *** 1003,1009 **** } void ! IceInternal::setMcastInterface(SOCKET fd, const string& interface, bool IPv4) { int rc; if(IPv4) --- 1003,1009 ---- } void ! IceInternal::setMcastInterface(SOCKET fd, const string& p_interface, bool IPv4) { int rc; if(IPv4) *************** *** 1011,1020 **** // // First see if it is the interface name. If not check if IP Address. // ! struct in_addr iface = getInterfaceAddress(interface); if(iface.s_addr == INADDR_ANY) { ! struct sockaddr_storage addr = getAddressForServer(interface, 0, EnableIPv4); iface = reinterpret_cast(&addr)->sin_addr; } rc = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, int(sizeof(iface))); --- 1011,1020 ---- // // First see if it is the interface name. If not check if IP Address. // ! struct in_addr iface = getInterfaceAddress(p_interface); if(iface.s_addr == INADDR_ANY) { ! struct sockaddr_storage addr = getAddressForServer(p_interface, 0, EnableIPv4); iface = reinterpret_cast(&addr)->sin_addr; } rc = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, int(sizeof(iface))); *************** *** 1024,1033 **** // // First check if it is the interface name. If not check if index. // ! int interfaceNum = getInterfaceIndex(interface); if(interfaceNum == 0) { ! istringstream p(interface); if(!(p >> interfaceNum) || !p.eof()) { closeSocketNoThrow(fd); --- 1024,1033 ---- // // First check if it is the interface name. If not check if index. // ! int interfaceNum = getInterfaceIndex(p_interface); if(interfaceNum == 0) { ! istringstream p(p_interface); if(!(p >> interfaceNum) || !p.eof()) { closeSocketNoThrow(fd); diff -c -N -r Ice-3.4.1/cpp/src/Ice/Network.h Ice-3.4.1-ported/cpp/src/Ice/Network.h *** Ice-3.4.1/cpp/src/Ice/Network.h Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Ice/Network.h Fri Oct 15 11:49:18 2010 *************** *** 22,28 **** #ifdef _WIN32 # include # include ! typedef int ssize_t; #else # include # include --- 22,30 ---- #ifdef _WIN32 # include # include ! # if !defined(__GNUC__) ! typedef int ssize_t; ! # endif #else # include # include *************** *** 78,83 **** --- 80,117 ---- # define NETDB_SUCCESS 0 #endif + // compensate for mingw's (and MSVC6's) lack of recent Windows headers + #ifndef WSAID_CONNECTEX + # define WSAID_CONNECTEX {0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}} + # define WSAID_ACCEPTEX {0xb5367df1,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}} + # define SO_UPDATE_ACCEPT_CONTEXT 0x700B + # define SO_UPDATE_CONNECT_CONTEXT 0x7010 + typedef + BOOL + (PASCAL FAR * LPFN_CONNECTEX) ( + IN SOCKET s, + IN const struct sockaddr FAR *name, + IN int namelen, + IN PVOID lpSendBuffer OPTIONAL, + IN DWORD dwSendDataLength, + OUT LPDWORD lpdwBytesSent, + IN LPOVERLAPPED lpOverlapped + ); + + typedef + BOOL + (PASCAL FAR * LPFN_ACCEPTEX)( + IN SOCKET sListenSocket, + IN SOCKET sAcceptSocket, + IN PVOID lpOutputBuffer, + IN DWORD dwReceiveDataLength, + IN DWORD dwLocalAddressLength, + IN DWORD dwRemoteAddressLength, + OUT LPDWORD lpdwBytesReceived, + IN LPOVERLAPPED lpOverlapped + ); + #endif + namespace IceInternal { diff -c -N -r Ice-3.4.1/cpp/src/Ice/Service.cpp Ice-3.4.1-ported/cpp/src/Ice/Service.cpp *** Ice-3.4.1/cpp/src/Ice/Service.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Ice/Service.cpp Fri Oct 15 10:13:12 2010 *************** *** 852,858 **** int Ice::Service::main(int& argc, wchar_t* argv[], const InitializationData& initializationData) { ! #ifdef __BCPLUSPLUS__ // COMPILER FIX // // BCC doesn't see the main overload if we don't create the temp args object here. // --- 852,858 ---- int Ice::Service::main(int& argc, wchar_t* argv[], const InitializationData& initializationData) { ! #if defined( __BCPLUSPLUS__) || defined(__GNUC__) // COMPILER FIX // // BCC doesn't see the main overload if we don't create the temp args object here. // diff -c -N -r Ice-3.4.1/cpp/src/Ice/StringConverter.cpp Ice-3.4.1-ported/cpp/src/Ice/StringConverter.cpp *** Ice-3.4.1/cpp/src/Ice/StringConverter.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Ice/StringConverter.cpp Fri Oct 15 10:31:12 2010 *************** *** 20,25 **** --- 20,29 ---- #include #endif + #ifdef __MINGW32__ + #include + #endif + using namespace IceUtil; using namespace IceUtilInternal; using namespace std; diff -c -N -r Ice-3.4.1/cpp/src/Ice/SysLoggerI.cpp Ice-3.4.1-ported/cpp/src/Ice/SysLoggerI.cpp *** Ice-3.4.1/cpp/src/Ice/SysLoggerI.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Ice/SysLoggerI.cpp Thu Oct 21 11:42:02 2010 *************** *** 9,14 **** --- 9,15 ---- #include #include + #include using namespace std; *************** *** 107,120 **** } int logopt = LOG_PID | LOG_CONS; openlog(prefix.c_str(), logopt, _facility); } Ice::SysLoggerI::SysLoggerI(const string& prefix, int facility) : _facility(facility) { int logopt = LOG_PID | LOG_CONS; ! openlog(prefix.c_str(), logopt, facility); } Ice::SysLoggerI::~SysLoggerI() --- 108,129 ---- } int logopt = LOG_PID | LOG_CONS; + #if defined(__MINGW32__) + openlog(const_cast(prefix.c_str()), logopt, _facility); + #else openlog(prefix.c_str(), logopt, _facility); + #endif } Ice::SysLoggerI::SysLoggerI(const string& prefix, int facility) : _facility(facility) { int logopt = LOG_PID | LOG_CONS; ! #if defined(__MINGW32__) ! openlog(const_cast(prefix.c_str()), logopt, facility); ! #else ! openlog(prefix.c_str(), logopt, _facility); ! #endif } Ice::SysLoggerI::~SysLoggerI() diff -c -N -r Ice-3.4.1/cpp/src/Ice/ThreadPool.h Ice-3.4.1-ported/cpp/src/Ice/ThreadPool.h *** Ice-3.4.1/cpp/src/Ice/ThreadPool.h Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/Ice/ThreadPool.h Thu Oct 14 13:20:44 2010 *************** *** 338,344 **** // of the event handler. We need to lock the event handler here to call // finishMessage. // ! #if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) IceUtil::LockT sync(_mutex); #else IceUtil::LockT sync(_mutex); --- 338,344 ---- // of the event handler. We need to lock the event handler here to call // finishMessage. // ! #if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) || defined(__MINGW32__) IceUtil::LockT sync(_mutex); #else IceUtil::LockT sync(_mutex); diff -c -N -r Ice-3.4.1/cpp/src/IceBox/Admin.cpp Ice-3.4.1-ported/cpp/src/IceBox/Admin.cpp *** Ice-3.4.1/cpp/src/IceBox/Admin.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceBox/Admin.cpp Wed Oct 20 11:14:22 2010 *************** *** 24,30 **** }; //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 24,30 ---- }; //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IceBox/Makefile Ice-3.4.1-ported/cpp/src/IceBox/Makefile *** Ice-3.4.1/cpp/src/IceBox/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceBox/Makefile Wed Oct 20 11:10:37 2010 *************** *** 49,59 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ $(SERVER): $(SOBJS) $(LIBTARGETS) rm -f $@ --- 49,59 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ $(SERVER): $(SOBJS) $(LIBTARGETS) rm -f $@ diff -c -N -r Ice-3.4.1/cpp/src/IceBox/Service.cpp Ice-3.4.1-ported/cpp/src/IceBox/Service.cpp *** Ice-3.4.1/cpp/src/IceBox/Service.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceBox/Service.cpp Wed Oct 20 11:17:19 2010 *************** *** 137,143 **** } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 137,143 ---- } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IceDB/Makefile Ice-3.4.1-ported/cpp/src/IceDB/Makefile *** Ice-3.4.1/cpp/src/IceDB/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceDB/Makefile Wed Oct 20 11:28:06 2010 *************** *** 31,41 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 31,41 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/IceGrid/Activator.cpp Ice-3.4.1-ported/cpp/src/IceGrid/Activator.cpp *** Ice-3.4.1/cpp/src/IceGrid/Activator.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceGrid/Activator.cpp Wed Oct 20 15:14:37 2010 *************** *** 263,268 **** --- 263,273 ---- } #ifdef _WIN32 + + #if defined(__MINGW32__) + #define LOCALE_INVARIANT 0x007f + #endif + struct UnicodeStringLess { diff -c -N -r Ice-3.4.1/cpp/src/IceGrid/Client.cpp Ice-3.4.1-ported/cpp/src/IceGrid/Client.cpp *** Ice-3.4.1/cpp/src/IceGrid/Client.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceGrid/Client.cpp Wed Oct 20 15:36:03 2010 *************** *** 184,190 **** } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 184,190 ---- } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IceGrid/FreezeDB/Makefile Ice-3.4.1-ported/cpp/src/IceGrid/FreezeDB/Makefile *** Ice-3.4.1/cpp/src/IceGrid/FreezeDB/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceGrid/FreezeDB/Makefile Wed Oct 20 18:03:46 2010 *************** *** 44,54 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ # The slice2freeze rules are structured like this to avoid issues with --- 44,54 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ # The slice2freeze rules are structured like this to avoid issues with diff -c -N -r Ice-3.4.1/cpp/src/IceGrid/IceGridNode.cpp Ice-3.4.1-ported/cpp/src/IceGrid/IceGridNode.cpp *** Ice-3.4.1/cpp/src/IceGrid/IceGridNode.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceGrid/IceGridNode.cpp Wed Oct 20 15:36:03 2010 *************** *** 834,840 **** } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 834,840 ---- } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IceGrid/IceGridRegistry.cpp Ice-3.4.1-ported/cpp/src/IceGrid/IceGridRegistry.cpp *** Ice-3.4.1/cpp/src/IceGrid/IceGridRegistry.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceGrid/IceGridRegistry.cpp Wed Oct 20 15:36:25 2010 *************** *** 202,208 **** } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 202,208 ---- } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IceGrid/Makefile Ice-3.4.1-ported/cpp/src/IceGrid/Makefile *** Ice-3.4.1/cpp/src/IceGrid/Makefile Thu Jun 3 09:48:36 2010 --- Ice-3.4.1-ported/cpp/src/IceGrid/Makefile Wed Oct 20 17:59:33 2010 *************** *** 97,102 **** --- 97,104 ---- ICECPPFLAGS := $(ICECPPFLAGS) -I.. SLICE2CPPFLAGS := --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS) + LIBS += -lpdh + $(ADMIN): $(ADMIN_OBJS) $(LIBTARGETS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(ADMIN_OBJS) -lGlacier2 $(EXPAT_RPATH_LINK) -lIceXML -lIceGrid -lIcePatch2 -lIceBox \ diff -c -N -r Ice-3.4.1/cpp/src/IceGrid/SqlDB/Makefile Ice-3.4.1-ported/cpp/src/IceGrid/SqlDB/Makefile *** Ice-3.4.1/cpp/src/IceGrid/SqlDB/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceGrid/SqlDB/Makefile Wed Oct 20 18:04:14 2010 *************** *** 39,49 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 39,49 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $$(libdir)/(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/IceGridLib/Makefile Ice-3.4.1-ported/cpp/src/IceGridLib/Makefile *** Ice-3.4.1/cpp/src/IceGridLib/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceGridLib/Makefile Wed Oct 20 12:02:25 2010 *************** *** 58,68 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 58,68 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/IcePatch2/Calc.cpp Ice-3.4.1-ported/cpp/src/IcePatch2/Calc.cpp *** Ice-3.4.1/cpp/src/IcePatch2/Calc.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IcePatch2/Calc.cpp Wed Oct 20 11:41:19 2010 *************** *** 112,118 **** } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 112,118 ---- } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IcePatch2/Client.cpp Ice-3.4.1-ported/cpp/src/IcePatch2/Client.cpp *** Ice-3.4.1/cpp/src/IcePatch2/Client.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IcePatch2/Client.cpp Wed Oct 20 11:46:20 2010 *************** *** 327,333 **** } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 327,333 ---- } //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IcePatch2/Server.cpp Ice-3.4.1-ported/cpp/src/IcePatch2/Server.cpp *** Ice-3.4.1/cpp/src/IcePatch2/Server.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IcePatch2/Server.cpp Wed Oct 20 11:49:09 2010 *************** *** 214,220 **** #ifdef _WIN32 //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #ifdef __BCCPLUSPLUS__ int main(int argc, char* argv[]) --- 214,220 ---- #ifdef _WIN32 //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined( __BCCPLUSPLUS__) || defined(__MINGW32__) int main(int argc, char* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IcePatch2Lib/Makefile Ice-3.4.1-ported/cpp/src/IcePatch2Lib/Makefile *** Ice-3.4.1/cpp/src/IcePatch2Lib/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IcePatch2Lib/Makefile Wed Oct 20 11:32:46 2010 *************** *** 40,50 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 40,50 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/IceSSL/Makefile Ice-3.4.1-ported/cpp/src/IceSSL/Makefile *** Ice-3.4.1/cpp/src/IceSSL/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceSSL/Makefile Mon Oct 18 12:15:38 2010 *************** *** 42,48 **** CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS) SLICE2CPPFLAGS := --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) ! LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(OPENSSL_LIBS) $(CXXLIBS) $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ --- 42,48 ---- CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS) SLICE2CPPFLAGS := --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) ! LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(OPENSSL_LIBS) $(ICE_OS_LIBS) $(CXXLIBS) $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ *************** *** 50,60 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 50,60 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/IceStorm/Admin.cpp Ice-3.4.1-ported/cpp/src/IceStorm/Admin.cpp *** Ice-3.4.1/cpp/src/IceStorm/Admin.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceStorm/Admin.cpp Wed Oct 20 12:12:38 2010 *************** *** 26,32 **** }; //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 26,32 ---- }; //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IceStorm/FreezeDB/Makefile Ice-3.4.1-ported/cpp/src/IceStorm/FreezeDB/Makefile *** Ice-3.4.1/cpp/src/IceStorm/FreezeDB/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceStorm/FreezeDB/Makefile Wed Oct 20 12:19:42 2010 *************** *** 58,68 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ $(MIGRATE): $(MOBJS) rm -f $@ --- 58,68 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ $(MIGRATE): $(MOBJS) rm -f $@ diff -c -N -r Ice-3.4.1/cpp/src/IceStorm/FreezeDB/Migrate.cpp Ice-3.4.1-ported/cpp/src/IceStorm/FreezeDB/Migrate.cpp *** Ice-3.4.1/cpp/src/IceStorm/FreezeDB/Migrate.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceStorm/FreezeDB/Migrate.cpp Wed Oct 20 12:12:38 2010 *************** *** 35,41 **** }; //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 35,41 ---- }; //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) diff -c -N -r Ice-3.4.1/cpp/src/IceStorm/Makefile Ice-3.4.1-ported/cpp/src/IceStorm/Makefile *** Ice-3.4.1/cpp/src/IceStorm/Makefile Thu Jun 3 09:48:36 2010 --- Ice-3.4.1-ported/cpp/src/IceStorm/Makefile Wed Oct 20 11:51:28 2010 *************** *** 63,73 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ $(ADMIN): $(AOBJS) $(LIBTARGETS) rm -f $@ --- 63,73 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ $(ADMIN): $(AOBJS) $(LIBTARGETS) rm -f $@ diff -c -N -r Ice-3.4.1/cpp/src/IceStorm/SqlDB/Makefile Ice-3.4.1-ported/cpp/src/IceStorm/SqlDB/Makefile *** Ice-3.4.1/cpp/src/IceStorm/SqlDB/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceStorm/SqlDB/Makefile Wed Oct 20 12:20:18 2010 *************** *** 38,48 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 38,48 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/IceStormLib/Makefile Ice-3.4.1-ported/cpp/src/IceStormLib/Makefile *** Ice-3.4.1/cpp/src/IceStormLib/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceStormLib/Makefile Wed Oct 20 11:54:47 2010 *************** *** 37,47 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 37,47 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/IceUtil/Exception.cpp Ice-3.4.1-ported/cpp/src/IceUtil/Exception.cpp *** Ice-3.4.1/cpp/src/IceUtil/Exception.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceUtil/Exception.cpp Thu Oct 14 10:30:47 2010 *************** *** 14,20 **** #include #include ! #if defined(__GNUC__) && !defined(__sun) # include # include #endif --- 14,20 ---- #include #include ! #if defined(__GNUC__) && !defined(__sun) && !defined(__WIN32__) # include # include #endif *************** *** 52,58 **** Init init; ! #if defined(__GNUC__) && !defined(__sun) string getStackTrace() { --- 52,58 ---- Init init; ! #if defined(__GNUC__) && !defined(__sun) && !defined(__WIN32__) string getStackTrace() { *************** *** 183,189 **** IceUtil::Exception::Exception() : _file(0), _line(0) ! #if defined(__GNUC__) && !defined(__sun) , _stackTrace(getStackTrace()) #endif { --- 183,189 ---- IceUtil::Exception::Exception() : _file(0), _line(0) ! #if defined(__GNUC__) && !defined(__sun) && !defined(__WIN32__) , _stackTrace(getStackTrace()) #endif { *************** *** 192,198 **** IceUtil::Exception::Exception(const char* file, int line) : _file(file), _line(line) ! #if defined(__GNUC__) && !defined(__sun) , _stackTrace(getStackTrace()) #endif { --- 192,198 ---- IceUtil::Exception::Exception(const char* file, int line) : _file(file), _line(line) ! #if defined(__GNUC__) && !defined(__sun) && !defined(__WIN32__) , _stackTrace(getStackTrace()) #endif { diff -c -N -r Ice-3.4.1/cpp/src/IceUtil/FileUtil.cpp Ice-3.4.1-ported/cpp/src/IceUtil/FileUtil.cpp *** Ice-3.4.1/cpp/src/IceUtil/FileUtil.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceUtil/FileUtil.cpp Thu Oct 14 11:16:52 2010 *************** *** 296,310 **** #else ! IceUtilInternal::ifstream::ifstream(const string& path, ios_base::openmode mode) : std::ifstream(IceUtil::stringToWstring(path).c_str(), mode) ! { ! } ! void ! IceUtilInternal::ifstream::open(const string& path, ios_base::openmode mode) ! { ! std::ifstream::open(IceUtil::stringToWstring(path).c_str(), mode); ! } #endif --- 296,326 ---- #else ! # if defined(__MINGW32__) ! IceUtilInternal::ifstream::ifstream(const string& path, ios_base::openmode mode) : std::ifstream(path.c_str(), mode) ! { ! } ! ! void ! IceUtilInternal::ifstream::open(const string& path, ios_base::openmode mode) ! { ! std::ifstream::open(path.c_str(), mode); ! } ! ! # else ! ! IceUtilInternal::ifstream::ifstream(const string& path, ios_base::openmode mode) : std::ifstream(IceUtil::stringToWstring(path).c_str(), mode) ! { ! } ! ! void ! IceUtilInternal::ifstream::open(const string& path, ios_base::openmode mode) ! { ! std::ifstream::open(IceUtil::stringToWstring(path).c_str(), mode); ! } ! ! # endif #endif *************** *** 354,368 **** #else ! IceUtilInternal::ofstream::ofstream(const string& path, ios_base::openmode mode) : std::ofstream(IceUtil::stringToWstring(path).c_str(), mode) ! { ! } ! void ! IceUtilInternal::ofstream::open(const string& path, ios_base::openmode mode) ! { ! std::ofstream::open(IceUtil::stringToWstring(path).c_str(), mode); ! } #endif --- 370,400 ---- #else ! # if defined (__MINGW32__) ! IceUtilInternal::ofstream::ofstream(const string& path, ios_base::openmode mode) : std::ofstream(path.c_str(), mode) ! { ! } ! ! void ! IceUtilInternal::ofstream::open(const string& path, ios_base::openmode mode) ! { ! std::ofstream::open(path.c_str(), mode); ! } ! ! # else ! ! IceUtilInternal::ofstream::ofstream(const string& path, ios_base::openmode mode) : std::ofstream(IceUtil::stringToWstring(path).c_str(), mode) ! { ! } ! ! void ! IceUtilInternal::ofstream::open(const string& path, ios_base::openmode mode) ! { ! std::ofstream::open(IceUtil::stringToWstring(path).c_str(), mode); ! } ! ! # endif #endif diff -c -N -r Ice-3.4.1/cpp/src/IceUtil/InputUtil.cpp Ice-3.4.1-ported/cpp/src/IceUtil/InputUtil.cpp *** Ice-3.4.1/cpp/src/IceUtil/InputUtil.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceUtil/InputUtil.cpp Thu Oct 14 11:21:11 2010 *************** *** 176,182 **** Int64 strToInt64(const char* s, char** endptr, int base) { ! #if defined(_WIN32) # if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) return strToInt64Impl(s, endptr, base); # else --- 176,182 ---- Int64 strToInt64(const char* s, char** endptr, int base) { ! #if defined(_WIN32) && !defined(__GNUC__) # if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) return strToInt64Impl(s, endptr, base); # else diff -c -N -r Ice-3.4.1/cpp/src/IceUtil/Makefile Ice-3.4.1-ported/cpp/src/IceUtil/Makefile *** Ice-3.4.1/cpp/src/IceUtil/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceUtil/Makefile Thu Oct 14 12:50:00 2010 *************** *** 58,68 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ endif install:: all --- 58,68 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ endif install:: all diff -c -N -r Ice-3.4.1/cpp/src/IceUtil/Time.cpp Ice-3.4.1-ported/cpp/src/IceUtil/Time.cpp *** Ice-3.4.1/cpp/src/IceUtil/Time.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceUtil/Time.cpp Thu Oct 14 11:28:32 2010 *************** *** 12,18 **** #include #include ! #ifdef _WIN32 # include # include #else --- 12,18 ---- #include #include ! #if defined( _WIN32) && !defined(__GNUC__) # include # include #else *************** *** 68,74 **** { if(clock == Realtime) { ! #ifdef _WIN32 # if defined(_MSC_VER) struct _timeb tb; _ftime(&tb); --- 68,74 ---- { if(clock == Realtime) { ! #if defined( _WIN32) && !defined(__GNUC__) # if defined(_MSC_VER) struct _timeb tb; _ftime(&tb); *************** *** 89,95 **** } else // Monotonic { ! #if defined(_WIN32) if(frequency > 0.0) { Int64 count; --- 89,95 ---- } else // Monotonic { ! #if defined(_WIN32) && !defined(__GNUC__) if(frequency > 0.0) { Int64 count; *************** *** 111,117 **** # endif return Time(static_cast(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000); } ! #elif defined(__hpux) || defined(__APPLE__) // // HP/MacOS does not support CLOCK_MONOTONIC // --- 111,117 ---- # endif return Time(static_cast(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000); } ! #elif defined(__hpux) || defined(__APPLE__) || defined(__MINGW32__) // // HP/MacOS does not support CLOCK_MONOTONIC // diff -c -N -r Ice-3.4.1/cpp/src/IceUtil/UUID.cpp Ice-3.4.1-ported/cpp/src/IceUtil/UUID.cpp *** Ice-3.4.1/cpp/src/IceUtil/UUID.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceUtil/UUID.cpp Thu Oct 14 11:38:05 2010 *************** *** 14,20 **** // (/dev/random) to generate "version 4" UUIDs, as described in // http://www.ietf.org/internet-drafts/draft-mealling-uuid-urn-00.txt ! #ifdef _WIN32 # include #else # include --- 14,20 ---- // (/dev/random) to generate "version 4" UUIDs, as described in // http://www.ietf.org/internet-drafts/draft-mealling-uuid-urn-00.txt ! #if defined(_WIN32) && !defined(__GNUC__) # include #else # include *************** *** 24,30 **** using namespace std; ! #ifndef _WIN32 namespace { --- 24,30 ---- using namespace std; ! #if !defined(_WIN32) || defined(__MINGW32__) namespace { *************** *** 87,93 **** string IceUtil::generateUUID() { ! #ifdef _WIN32 UUID uuid; UuidCreate(&uuid); --- 87,93 ---- string IceUtil::generateUUID() { ! #if defined( _WIN32) && !defined(__GNUC__) UUID uuid; UuidCreate(&uuid); diff -c -N -r Ice-3.4.1/cpp/src/IceXML/Makefile Ice-3.4.1-ported/cpp/src/IceXML/Makefile *** Ice-3.4.1/cpp/src/IceXML/Makefile Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/src/IceXML/Makefile Fri Oct 15 16:26:01 2010 *************** *** 31,41 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) --- 31,41 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff -c -N -r Ice-3.4.1/cpp/src/Slice/Makefile Ice-3.4.1-ported/cpp/src/Slice/Makefile *** Ice-3.4.1/cpp/src/Slice/Makefile Thu Jun 3 09:48:36 2010 --- Ice-3.4.1-ported/cpp/src/Slice/Makefile Thu Oct 14 12:49:23 2010 *************** *** 51,61 **** $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(SONAME) $@ endif install:: all --- 51,61 ---- $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) rm -f $@ ! ln -s $(libdir)/$(LIBFILENAME) $@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ! ln -s $(libdir)/$(SONAME) $@ endif install:: all diff -c -N -r Ice-3.4.1/cpp/test/IceUtil/unicode/Client.cpp Ice-3.4.1-ported/cpp/test/IceUtil/unicode/Client.cpp *** Ice-3.4.1/cpp/test/IceUtil/unicode/Client.cpp Thu Jun 3 09:48:34 2010 --- Ice-3.4.1-ported/cpp/test/IceUtil/unicode/Client.cpp Wed Oct 20 18:18:18 2010 *************** *** 24,30 **** // //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32) && !defined(__BCPLUSPLUS__) int wmain(int argc, wchar_t* argv[]) --- 24,30 ---- // //COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. ! #if defined(_WIN32) && !defined(__BCPLUSPLUS__) && !defined(__MINGW32__) int wmain(int argc, wchar_t* argv[]) *************** *** 42,48 **** { #ifdef _WIN32 ! #ifdef __BCPLUSPLUS__ dir = argv[1]; #else dir = IceUtil::wstringToString(argv[1]); --- 42,48 ---- { #ifdef _WIN32 ! #if defined( __BCPLUSPLUS__) || defined( __MINGW32__ ) dir = argv[1]; #else dir = IceUtil::wstringToString(argv[1]);