Home / Browse / OpalVOIP / Mail / Archive

OpalVOIP

Email Archive: opalvoip-svn (read-only)

[Opalvoip-svn] SF.net SVN: opalvoip: [20145] ptlib/trunk

From: <csoutheren@us...> - 2008-04-30 03:52

Revision: 20145
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20145&view=rev
Author:   csoutheren
Date:     2008-04-29 20:53:02 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
Fully implement Windows screen capture device

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/msos/ptlib/vidinput_app.h
    ptlib/trunk/src/ptlib/msos/vidinput_app.cxx

Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_app.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_app.h	2008-04-30 01:48:34 UTC (rev 20144)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_app.h	2008-04-30 03:53:02 UTC (rev 20145)
@@ -51,14 +51,13 @@
 
     /**Close the video input device on destruction.
       */
-    ~PVideoInputDevice_Application() { Close(); }
+    ~PVideoInputDevice_Application();
 
     /** Is the device a camera, and obtain video
      */
     static PStringArray GetInputDeviceNames();
 
-    virtual PStringArray GetDeviceNames() const
-      { return GetInputDeviceNames(); }
+    virtual PStringArray GetDeviceNames() const;
 
     /**Retrieve a list of Device Capabilities
     */
@@ -94,6 +93,8 @@
       */
     virtual PBoolean IsCapturing();
 
+    virtual PBoolean SetVideoFormat(VideoFormat newFormat);
+
     /**Set the colour format to be used.
        Note that this function does not do any conversion. If it returns TRUE
        then the video device does the colour format in native mode.
@@ -167,8 +168,10 @@
     );
 
   protected:
-      HWND m_hWnd;               ///< Handle of Window to Capture
-      bool m_client;             ///< Capture the client area only
+      HWND m_hWnd;                   ///< Handle of Window to Capture
+      bool m_client;                 ///< Capture the client area only
+      PBYTEArray bitMapInfoStorage;  ///< used for storing raw DIB
+      PBYTEArray tempPixelBuffer;    ///< used for storing temporary version of bitmap during convertion
 
       PMutex lastFrameMutex;     ///< Frame Grab Mutex
       PAdaptiveDelay grabDelay;  ///< Frame Grab delay

Modified: ptlib/trunk/src/ptlib/msos/vidinput_app.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_app.cxx	2008-04-30 01:48:34 UTC (rev 20144)
+++ ptlib/trunk/src/ptlib/msos/vidinput_app.cxx	2008-04-30 03:53:02 UTC (rev 20145)
@@ -17,7 +17,7 @@
  *
  *
  *
- * Contributor(s): ______________________________________.
+ * Contributor(s): Craig Southeren, Post Increment (C) 2008
  *
  * $Revision$
  * $Author$
@@ -39,183 +39,132 @@
 {
   public:
     virtual PObject *    CreateInstance(int /*userData*/) const { return new PVideoInputDevice_Application; }
+
     virtual PStringArray GetDeviceNames(int /*userData*/) const { return PVideoInputDevice_Application::GetInputDeviceNames(); }
+
     virtual bool         GetDeviceCapabilities(const PString & deviceName, void * caps) const
       { return PVideoInputDevice_Application::GetDeviceCapabilities(deviceName, (PVideoInputDevice::Capabilities *)caps); }
 
+    virtual bool ValidateDeviceName(const PString & deviceName, int /*userData*/) const
+    {
+      return (deviceName.Left(10) *= "appwindow:") && (FindWindow(NULL, deviceName.Mid(10)) != NULL);
+    }
+
+
 } PVideoInputDevice_Application_descriptor;
 
 PCREATE_PLUGIN(Application, PVideoInputDevice, &PVideoInputDevice_Application_descriptor);
 
-
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // Input device
 
 PVideoInputDevice_Application::PVideoInputDevice_Application()
 {
-    m_client = true;
-    preferredColourFormat = "BGR24";  
+  m_hWnd                = NULL;
+  m_client              = true;
+
+  SetColourFormat("BGR32");
+  SetFrameRate(10);
 }
 
+PVideoInputDevice_Application::~PVideoInputDevice_Application()
+{
+  Close();
+}
 
+PStringArray PVideoInputDevice_Application::GetDeviceNames() const
+{ 
+  return GetInputDeviceNames(); 
+}
+
 PStringArray PVideoInputDevice_Application::GetInputDeviceNames()
 {
-    return PString("Application");
+  return PString("Application");
 }
 
 PBoolean PVideoInputDevice_Application::GetDeviceCapabilities(const PString & /*deviceName*/, Capabilities * /*caps*/)  
 { 
-    return false; 
+  return false; 
 }
 
-void CaptureScreenToBYTEArray(LPRECT lpRect, PBYTEArray & array)
+PBoolean PVideoInputDevice_Application::Open(const PString & deviceName, PBoolean /*startImmediate*/)
 {
-    HDC         hScrDC, hMemDC;         // screen DC and memory DC     
-    int         nX, nY, nX2, nY2;       // coordinates of rectangle to grab     
-    int         nWidth, nHeight;        // DIB width and height     
-    int         xScrn, yScrn;           // screen resolution      
+  Close();
 
-    HGDIOBJ     hOldBitmap , hBitmap;
-        
-        // check for an empty rectangle 
-    if (IsRectEmpty(lpRect))       
-       return;      
-       // create a DC for the screen and create     
-       // a memory DC compatible to screen DC          
+  m_client = false;
 
-   hScrDC = CreateDC("DISPLAY", NULL, NULL, NULL);     
-   hMemDC = CreateCompatibleDC(hScrDC);      // get points of rectangle to grab  
-   
-   nX = lpRect->left;     
-   nY = lpRect->top;     
-   nX2 = lpRect->right;     
-   nY2 = lpRect->bottom;      // get screen resolution      
-   
-   xScrn = GetDeviceCaps(hScrDC, HORZRES);     
-   yScrn = GetDeviceCaps(hScrDC, VERTRES);      
-   
-   //make sure bitmap rectangle is visible      
-   
-   if (nX < 0)         
-      nX = 0;     
-   
-   if (nY < 0)         
-      nY = 0;     
-   
-   if (nX2 > xScrn)         
-      nX2 = xScrn;     
-   
-   if (nY2 > yScrn)         
-      nY2 = yScrn;      
+  RECT rect;
+  memset(&rect, 0, sizeof(rect));  // needed to avoid compiler warning
 
-   nWidth = nX2 - nX;     
-   nHeight = nY2 - nY;      
-   
-   // create a bitmap compatible with the screen DC     
-   
-   hBitmap = CreateCompatibleBitmap(hScrDC, nWidth, nHeight);      
-   
-   // select new bitmap into memory DC     
-   
-   hOldBitmap =   SelectObject (hMemDC, hBitmap);      
-   
-   // bitblt screen DC to memory DC     
-   
-   BitBlt(hMemDC, 0, 0, nWidth, nHeight, hScrDC, nX, nY, SRCCOPY);     
-   
-   // select old bitmap back into memory DC and get handle to     
-   // bitmap of the screen          
-   
-   hBitmap = SelectObject(hMemDC, hOldBitmap);    
-
-   // now we have a screencapture to bitmap
-   BITMAPINFO    bmpInfo;
-   bmpInfo.bmiHeader.biBitCount=0;
-   bmpInfo.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
-   GetDIBits(hMemDC,(HBITMAP)hBitmap,0,0,NULL,&bmpInfo,DIB_RGB_COLORS);
-   bmpInfo.bmiHeader.biCompression=BI_RGB;
-
-   // Store the data
-   array = PBYTEArray((BYTE *)&bmpInfo, bmpInfo.bmiHeader.biSize);
-
-   // clean up      
-   DeleteDC(hScrDC);     
-   DeleteDC(hMemDC);      
-}
-
-void PVideoInputDevice_Application::AttachCaptureWindow(HWND _hwnd, bool _client)
-{
-    m_hWnd = _hwnd;
-    m_client = _client;
-}
-
-PBoolean PVideoInputDevice_Application::Open(const PString & /*DeviceName*/, PBoolean /*startImmediate*/)
-{
-    Close();
-
-    if (!m_hWnd) {
-        PTRACE(4,"APP/tOpen Fail no Window to capture specified!");
-        return false;
+  if (m_hWnd == NULL) {
+    if (deviceName.Left(10) *= "appwindow:") {
+      m_hWnd = FindWindow(NULL, deviceName.Mid(10));
+      if (m_hWnd != NULL) {
+        ::GetWindowRect(m_hWnd, &rect);
+        SetFrameSize(rect.right-rect.left, rect.bottom-rect.top);
+      }
     }
+  }
 
-    RECT _rect;
-    ::GetWindowRect(m_hWnd,&_rect);
-     PVideoDevice::SetFrameSize(_rect.right,_rect.bottom);
+  if (m_hWnd == NULL) {
+    PTRACE(4,"AppInput/tOpen Fail no Window to capture specified!");
+    return false;
+  }
 
-    return true;
+  return true;
 }
 
 PBoolean PVideoInputDevice_Application::IsOpen()
 {
-    return false;
+  return m_hWnd != NULL;
 }
 
 PBoolean PVideoInputDevice_Application::Close()
 {
-    if (!IsOpen())
-        return false;
+  if (!IsOpen())
+    return false;
 
-    return true;
+  return true;
 }
 
 PBoolean PVideoInputDevice_Application::Start()
 {
-    return false;
+  return true;
 }
 
 PBoolean PVideoInputDevice_Application::Stop()
 {
-    return false;
+  return true;
 }
 
 PBoolean PVideoInputDevice_Application::IsCapturing()
 {
-    return false;
+  return IsOpen();
 }
 
-PBoolean PVideoInputDevice_Application::SetColourFormat(
-      const PString & /*ColourFormat*/ 
-    )
+PBoolean PVideoInputDevice_Application::SetVideoFormat(VideoFormat newFormat)
 {
-     return true;
+  return PVideoDevice::SetVideoFormat(newFormat);
 }
 
-PBoolean PVideoInputDevice_Application::SetFrameRate(
-      unsigned Rate 
-    )
+PBoolean PVideoInputDevice_Application::SetColourFormat(const PString & colourFormat)
 {
-    return PVideoDevice::SetFrameRate(Rate);
+  if ((colourFormat *= "BGR32") || (colourFormat *= "BGR24"))
+    return PVideoDevice::SetColourFormat(colourFormat);
+
+  return PFalse;
 }
 
-PBoolean PVideoInputDevice_Application::SetFrameSize(
-      unsigned /*Width*/,   
-      unsigned /*Height*/   
-    )
+PBoolean PVideoInputDevice_Application::SetFrameRate(unsigned Rate)
 {
-    PTRACE(4,"APP/tFrame size cannot be set! Must be detected from Application!");
-    return true;
+  return PVideoDevice::SetFrameRate(Rate);
 }
 
+PBoolean PVideoInputDevice_Application::SetFrameSize(unsigned width, unsigned height)
+{
+  return PVideoDevice::SetFrameSize(width, height);
+}
+
 PINDEX PVideoInputDevice_Application::GetMaxFrameBytes()
 {
   return GetMaxFrameBytesConverted(CalculateFrameBytes(frameWidth, frameHeight, colourFormat));
@@ -230,69 +179,165 @@
     return GetFrameDataNoDelay(buffer,bytesReturned);
 }
 
-PBoolean PVideoInputDevice_Application::GetFrameDataNoDelay(
-      BYTE * buffer,                 
-      PINDEX * bytesReturned  
-    )
+static inline WORD GetNumberOfColours(WORD bitsPerPixel)
 {
+    // only 1, 4 and 8bpp bitmaps use palettes (well, they could be used with
+    // 24bpp ones too but we don't support this as I think it's quite uncommon)
+    return (WORD)(bitsPerPixel <= 8 ? 1 << bitsPerPixel : 0);
+}
 
-   PWaitAndSignal m(lastFrameMutex);
+PBoolean PVideoInputDevice_Application::GetFrameDataNoDelay(BYTE * buffer, PINDEX * bytesReturned)
+{
+  PWaitAndSignal m(lastFrameMutex);
 
-   PTRACE(6,"AppInput\tGrabbing Frame");
+  PTRACE(6,"AppInput\tGrabbing Frame");
 
-   // Get the current application window
-   RECT _rect;
-   if (!m_client) {
-     ::GetWindowRect(m_hWnd,&_rect);
-     if ((_rect.right != (signed)frameWidth) ||
-        (_rect.bottom != (signed)frameHeight))
-          PVideoDevice::SetFrameSize(_rect.right,_rect.bottom);
-   } else {
-     ::GetClientRect(m_hWnd,&_rect);
-     if ((_rect.right != (signed)frameWidth) ||
-        (_rect.bottom != (signed)frameHeight))
-          PVideoDevice::SetFrameSize(_rect.right,_rect.bottom);
+  RECT _rect;
 
-       POINT pt1,pt2;
-         pt1.x = _rect.left;             
-         pt1.y = _rect.top;             
-         pt2.x = _rect.right;             
-         pt2.y = _rect.bottom;             
-         ::ClientToScreen(m_hWnd,&pt1);             
-         ::ClientToScreen(m_hWnd,&pt2);             
-         _rect.left = pt1.x;             
-         _rect.top = pt1.y;             
-         _rect.right = pt2.x;             
-         _rect.bottom = pt2.y;  
-   }
+  // Get the client area of the window
+  if (m_client) {
 
-    PBYTEArray frame;
-    CaptureScreenToBYTEArray(&_rect,frame);
+    ::GetClientRect(m_hWnd, &_rect);
+    int width  = _rect.right - _rect.left;
+    int height = _rect.bottom - _rect.top;
+    if ((width != (int)frameWidth) || (height != (signed)frameHeight))
+      PVideoDevice::SetFrameSize(width, height);
 
-    bool retval = false;
-    long pBufferSize = frame.GetSize();
-    BYTE * pBuffer = frame.GetPointer();
-    
-   PTRACE(6,"AppInput\tBuffer obtained." << pBufferSize );
-   if (pBuffer != NULL) {
-  
-    // Convert the image for output
-      if (NULL != converter) {
-         retval = converter->Convert(pBuffer,buffer, bytesReturned);
-         PTRACE(6,"AppInput\tBuffer converted." << *bytesReturned );
+    POINT pt1;
+    pt1.x = _rect.left;
+    pt1.y = _rect.top;
+    ::ClientToScreen(m_hWnd, &pt1);
+
+    POINT pt2;
+    pt2.x = _rect.right;             
+    pt2.y = _rect.bottom;             
+    ::ClientToScreen(m_hWnd, &pt2);
+
+    _rect.left   = pt1.x;             
+    _rect.top    = pt1.y;             
+    _rect.right  = pt2.x;             
+    _rect.bottom = pt2.y;  
+  }
+  else
+  {
+    ::GetWindowRect(m_hWnd, &_rect);
+  }
+
+  bool retVal = true;
+
+  if (!IsRectEmpty(&_rect)) {
+
+    // create a DC for the screen and create
+    // a memory DC compatible to screen DC
+    HDC hScrDC = CreateDC("DISPLAY", NULL, NULL, NULL);
+    HDC hMemDC = CreateCompatibleDC(hScrDC);
+
+    // get borders of grab area in pixels
+    int left   = _rect.left;     
+    int top    = _rect.top;     
+    int right  = _rect.right;     
+    int bottom = _rect.bottom;
+
+    // get size of screen in pixels
+    //int xScrn = GetDeviceCaps(hScrDC, HORZRES);
+    //int yScrn = GetDeviceCaps(hScrDC, VERTRES);
+
+#if 0
+    // make sure bitmap rectangle is visible
+    if (left < 0)
+      nX = 0;
+    if (nY < 0)
+      nY = 0;
+    if (nX2 > xScrn)
+      nX2 = xScrn;
+    if (nY2 > yScrn)
+      nY2 = yScrn;
+#endif
+
+    // get width and height of grab region
+    int nWidth  = right - left;
+    int nHeight = bottom - top;
+
+    HBITMAP hBitMap;
+    {
+       // create a bitmap compatible with the screen DC
+      HGDIOBJ _hBitmap = CreateCompatibleBitmap(hScrDC, nWidth, nHeight);
+   
+      // select new bitmap into memory DC
+      HGDIOBJ _hOldBitmap = SelectObject(hMemDC, _hBitmap);
+   
+      // bitblt screen DC to memory DC     
+      BitBlt(hMemDC, 0, 0, nWidth, nHeight, hScrDC, left, top, SRCCOPY);
+   
+      // select old bitmap back into memory DC and get handle to     
+      // bitmap of the screen
+      hBitMap = (HBITMAP)SelectObject(hMemDC, _hOldBitmap);
+    }
+
+    // get the bitmap information
+    BITMAP bitmap;
+    if (GetObject(hBitMap, sizeof(BITMAP), (LPSTR)&bitmap) == 0) {
+      PTRACE(2, "AppInput\tCould not get bitmap information");
+      retVal = false;
+    }
+    else
+    {
+      // create a BITMAPINFO with enough room for the pixel data
+      unsigned pixelOffs = sizeof(BITMAPINFOHEADER) + GetNumberOfColours(bitmap.bmBitsPixel) * sizeof(RGBQUAD);
+      LPBITMAPINFO bitmapInfo = (LPBITMAPINFO)bitMapInfoStorage.GetPointer(pixelOffs + (bitmap.bmHeight * bitmap.bmWidthBytes));
+      BITMAPINFOHEADER & bi = bitmapInfo->bmiHeader;
+      memset(&bi, 0, sizeof(bi));
+
+      bi.biSize        = sizeof(BITMAPINFOHEADER);
+      bi.biWidth       = bitmap.bmWidth;
+      bi.biHeight      = bitmap.bmHeight;
+      bi.biPlanes      = 1;
+      bi.biBitCount    = bitmap.bmBitsPixel;
+      bi.biCompression = BI_RGB;
+
+      // get the pixel data
+      int scanLines = GetDIBits(hMemDC, 
+                                (HBITMAP)hBitMap, 
+                                0, bitmap.bmHeight, 
+                                (char *)bitmapInfo + pixelOffs,
+                                bitmapInfo,
+                                DIB_RGB_COLORS);
+
+      if (scanLines == 0) {
+        PTRACE(2, "AppInput\tFailed to convert image");
       } else {
+        int srcPixelSize  = bitmap.bmBitsPixel / 8;
+        int dstPixelSize  = (colourFormat == "BGR32") ? 4 : 3;
 
-         PTRACE(6,"AppInput\tBuffer copied." << pBufferSize );
-         memcpy(buffer, pBuffer, pBufferSize);
-         if (buffer != NULL)
-           *bytesReturned = pBufferSize;
-        retval = true;
+        // convert from 24/32 bit to 24/32 bit, and invert top to bottom
+        BYTE * src = (BYTE *)bitmapInfo + pixelOffs + (bitmap.bmHeight-1) * bitmap.bmWidthBytes;
+        BYTE * dst = (converter == NULL) ? buffer : tempPixelBuffer.GetPointer(bitmap.bmHeight*bitmap.bmWidth * dstPixelSize);
+        for (long y = 0; y < bitmap.bmHeight; ++y) {
+          for (long x = 0; x < bitmap.bmWidth; ++x) {
+            memcpy(dst, src, 3);
+            if (dstPixelSize == 4)
+              *dst++ = 0;
+            src += srcPixelSize;
+            dst += dstPixelSize;
+          }
+          src -= bitmap.bmWidth*srcPixelSize + bitmap.bmWidthBytes;
+        }
+        *bytesReturned = bitmap.bmHeight * bitmap.bmWidth * dstPixelSize;
+        if (converter != NULL && !converter->Convert(tempPixelBuffer.GetPointer(), buffer, bytesReturned)) {
+          PTRACE(2, "AppInput\tConverter failed");
+          retVal = false;
+        }
       }
-   }
+    }
 
-  PTRACE(6,"App\tBuffer Transcoded "  << retval);
-  
-  return retval;  
+    DeleteObject(hBitMap); 
+    DeleteDC(hScrDC);
+    DeleteDC(hMemDC);
+  }
+
+  /////////////////////////////////////////////////////////////////////
+
+  return retVal;
 }
 
 
@@ -303,8 +348,13 @@
 
 PBoolean PVideoInputDevice_Application::SetChannel(int /*newChannel*/)
 {
-
   return true;
 }
 
+void PVideoInputDevice_Application::AttachCaptureWindow(HWND _hwnd, bool _client)
+{
+    m_hWnd = _hwnd;
+    m_client = _client;
+}
+
 #endif  // P_APPSHARE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Opalvoip-svn] SF.net SVN: opalvoip: [18737] ptlib/trunk	<rjongbloed@us...>

[Opalvoip-svn] SF.net SVN: opalvoip: [18738] ptlib/trunk

From: <shorne@us...> - 2007-10-22 18:33

Revision: 18738
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18738&view=rev
Author:   shorne
Date:     2007-10-22 11:33:45 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Visual Studio Support

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/pvfiledev.h
    ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx

Modified: ptlib/trunk/include/ptclib/pvfiledev.h
===================================================================
--- ptlib/trunk/include/ptclib/pvfiledev.h	2007-10-22 13:51:31 UTC (rev 18737)
+++ ptlib/trunk/include/ptclib/pvfiledev.h	2007-10-22 18:33:45 UTC (rev 18738)
@@ -152,6 +152,13 @@
     virtual PStringList GetDeviceNames() const
       { return GetInputDeviceNames(); }
 
+	/**Retrieve a list of Device Capabilities
+	  */
+	static BOOL GetDeviceCapabilities(
+      const PString & /*deviceName*/,           ///< Name of device
+	  InputDeviceCapabilities & /*caps*/        ///< List of supported capabilities
+	  )  { return FALSE; }
+
     /**Get the maximum frame size in bytes.
 
        Note a particular device may be able to provide variable length

Modified: ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2007-10-22 13:51:31 UTC (rev 18737)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2007-10-22 18:33:45 UTC (rev 18738)
@@ -38,8 +38,8 @@
 
 #ifdef _MSC_VER
 #ifndef _WIN32_WCE
-#pragma comment(lib,"strmbase.lib")
 #pragma comment(lib,"strmiids.lib")
+#pragma comment(lib,"quartz.lib")
 #endif
 #endif
 
@@ -54,6 +54,28 @@
 
 PCREATE_VIDINPUT_PLUGIN(DirectShow);
 
+
+static void MyDeleteMediaType(AM_MEDIA_TYPE *pmt)
+{
+    if (pmt == NULL)
+	return;
+
+    if (pmt->cbFormat != 0)
+    {
+	CoTaskMemFree((PVOID)pmt->pbFormat);
+        pmt->cbFormat = 0;
+        pmt->pbFormat = NULL;
+    }
+    if (pmt->pUnk != NULL)
+    {
+        // Uncessessary because pUnk should not be used, but safest.
+        pmt->pUnk->Release();
+        pmt->pUnk = NULL;
+    }
+
+    CoTaskMemFree(pmt);
+}
+
 PVideoInputDevice_DirectShow::PVideoInputDevice_DirectShow()
 {
   PTRACE(1,"PVidDirectShow\tPVideoInputDevice_DirectShow: constructor" );
@@ -228,7 +250,6 @@
 PStringList PVideoInputDevice_DirectShow::GetInputDeviceNames()
 {
     HRESULT hr;
-    IBaseFilter * pSrc = NULL;
     IMoniker *pMoniker =NULL;
     ICreateDevEnum *pDevEnum =NULL;
     IEnumMoniker *pClassEnum = NULL;
@@ -265,16 +286,8 @@
         return list;
     }
 
-    while (1)
+    while (hr = pClassEnum->Next(1, &pMoniker, &cFetched), hr==S_OK)
     {
-	// Get the next device
-	hr = pClassEnum->Next(1, &pMoniker, &cFetched);
-	if (hr != S_OK)
-	{
-	    PTRACE(4, "PVidDirectShow\tGetInputDeviceNames() No more video capture device");
-	    break;
-	}
-
 	// Get the property bag
 	IPropertyBag *pPropBag;
 
@@ -317,7 +330,7 @@
 
     /* FIXME: If the device is already open, close it */
     if (IsOpen())
-	Close();
+	     return TRUE;
 
     deviceName = devName;
 
@@ -447,7 +460,6 @@
 
 BOOL PVideoInputDevice_DirectShow::Stop()
 {
-    HRESULT hr;
 
     PTRACE(1,"PVidDirectShow\tStop()");
 
@@ -475,19 +487,20 @@
 void PVideoInputDevice_DirectShow::FlipVertical(BYTE *buffer)
 {
     unsigned int bytesPerLine = frameBytes / frameHeight;
-    BYTE templine[bytesPerLine];
+	BYTE  * templine = new BYTE[bytesPerLine];
     BYTE *s = buffer;
     BYTE *d = buffer + frameBytes - bytesPerLine;
     unsigned int i;
 
     for (i=0; i<frameHeight/2; i++)
     {
-	memcpy(templine, s, bytesPerLine);
+	memcpy(&templine, s, bytesPerLine);
 	memcpy(s, d, bytesPerLine);
-	memcpy(d, templine, bytesPerLine);
+	memcpy(d, &templine, bytesPerLine);
 	s += bytesPerLine;
 	d -= bytesPerLine;
     }
+    delete templine;
 }
 
 /*
@@ -621,9 +634,9 @@
     AM_MEDIA_TYPE *pMediaFormat;
     int iCount, iSize;
     VIDEO_STREAM_CONFIG_CAPS scc;
-    unsigned int i;
+    int i;
     BOOL was_capturing = FALSE;
-    OAFilterState filterState;
+    OAFilterState filterState = State_Stopped;
 
     PTRACE(4, "PVidDirectShow\tSetFormat(\""
 	      << (wanted_format.IsEmpty()?"Not changed":wanted_format) <<"\", "
@@ -662,7 +675,7 @@
 	return FALSE;
     }
 
-    for (i=0; i<iCount; i++, DeleteMediaType(pMediaFormat))
+    for (i=0; i<iCount; i++, MyDeleteMediaType(pMediaFormat))
     {
 	pMediaFormat = NULL;
 	hr = pStreamConfig->GetStreamCaps(i, &pMediaFormat, (BYTE *)&scc);
@@ -764,7 +777,7 @@
 	}
 #endif
 
-	DeleteMediaType(pMediaFormat);
+	MyDeleteMediaType(pMediaFormat);
 	pStreamConfig->Release();
 	return TRUE;
     }
@@ -1025,6 +1038,12 @@
 }
 
 
+BOOL PVideoInputDevice_DirectShow::GetDeviceCapabilities(const PString & /*deviceName*/,InputDeviceCapabilities & /*caps*/)  
+{ 
+    // To do!
+    return FALSE; 
+}
+
 /*
  *
  *
@@ -1036,7 +1055,7 @@
     AM_MEDIA_TYPE *pMediaFormat;
     int iCount, iSize;
     VIDEO_STREAM_CONFIG_CAPS scc;
-    unsigned int i;
+    int i;
 
     PTRACE(1, "PVidDirectShow\tListSupportedFormats()");
 
@@ -1087,7 +1106,7 @@
 		    << (10000000.0/VideoInfo->AvgTimePerFrame) << "fps)");
 	}
 
-	DeleteMediaType(pMediaFormat);
+	MyDeleteMediaType(pMediaFormat);
     }
 
     pStreamConfig->Release();
@@ -1145,8 +1164,10 @@
 
     }
 
-    DeleteMediaType(pMediaFormat);
+    MyDeleteMediaType(pMediaFormat);
     pStreamConfig->Release();
+
+	return TRUE;
 }
 
 
@@ -1207,8 +1228,13 @@
     if (dwMsgLen)
 	return string;
 
+#ifdef __MINGW32__  // This function is not recognised in Windows
     snprintf(string, sizeof(string), "0x%8.8x", hr);
-    return string;
+	return string;
+#else
+	return PString();
+#endif
+    
 }
 
 static HRESULT SetDevice(const PString & devName, IBaseFilter ** ppSrcFilter)
@@ -1312,20 +1338,17 @@
 }
 
 
-struct pwlib_fmt
-{
+struct {
     char *pwlib_format;
     GUID  media_format;
-};
-
-static struct pwlib_fmt formats[] =
+} formats[] =
 {
     {(char*) "Grey",    MEDIASUBTYPE_RGB8 },
     {(char*) "BGR32",   MEDIASUBTYPE_RGB32}, /* Microsoft assumes that we are in little endian */
     {(char*) "BGR24",   MEDIASUBTYPE_RGB24},
     {(char*) "RGB565",  MEDIASUBTYPE_RGB565},
     {(char*) "RGB555",  MEDIASUBTYPE_RGB555},
-    {(char*) "YUV420P", MEDIASUBTYPE_I420},
+    {(char*) "YUV420P", MEDIASUBTYPE_IYUV},  
     {(char*) "YUV422P", MEDIASUBTYPE_YUYV},
     {(char*) "YUV411",  MEDIASUBTYPE_Y411},
     {(char*) "YUV411P", MEDIASUBTYPE_Y41P},
@@ -1416,7 +1439,7 @@
 	return "BGR24";
     else if (guid == MEDIASUBTYPE_RGB32)
 	return "BGR32";
-    else if (guid == MEDIASUBTYPE_I420)
+    else if (guid == MEDIASUBTYPE_IYUV)
 	return "I420";
     else
 	return guid_to_string(guid); /* FIXME: memory leak */
@@ -1437,29 +1460,4 @@
     return strdup(guid_string);
 }
 
-#ifdef __MINGW32__
-
-static void DeleteMediaType(AM_MEDIA_TYPE *pmt)
-{
-    if (pmt == NULL)
-	return;
-
-    if (pmt->cbFormat != 0)
-    {
-	CoTaskMemFree((PVOID)pmt->pbFormat);
-        pmt->cbFormat = 0;
-        pmt->pbFormat = NULL;
-    }
-    if (pmt->pUnk != NULL)
-    {
-        // Uncessessary because pUnk should not be used, but safest.
-        pmt->pUnk->Release();
-        pmt->pUnk = NULL;
-    }
-
-    CoTaskMemFree(pmt);
-}
-
-#endif
-
 #endif /*P_DIRECTSHOW*/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18739] ptlib/trunk

From: <shorne@us...> - 2007-10-22 18:37

Revision: 18739
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18739&view=rev
Author:   shorne
Date:     2007-10-22 11:36:06 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Added ability to get device capabilities for Input Devices

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/videoio.h
    ptlib/trunk/src/ptlib/common/vfakeio.cxx
    ptlib/trunk/src/ptlib/msos/vfw.cxx

Modified: ptlib/trunk/include/ptlib/videoio.h
===================================================================
--- ptlib/trunk/include/ptlib/videoio.h	2007-10-22 18:33:45 UTC (rev 18738)
+++ ptlib/trunk/include/ptlib/videoio.h	2007-10-22 18:36:06 UTC (rev 18739)
@@ -267,6 +267,7 @@
 
 #include <ptlib/plugin.h>
 #include <ptlib/pluginmgr.h>
+#include <list>
 
 class PColourConverter;
 
@@ -963,7 +964,16 @@
 
 #endif // SHOULD_BE_MOVED_TO_PLUGIN
 
+typedef struct {
+public:
+	unsigned      height;
+	unsigned      width;
+	const char*   format;
+	double        fps;
+} InputDeviceCapability; 
 
+typedef std::list<InputDeviceCapability>  InputDeviceCapabilities;
+
 /**This class defines a video input device.
  */
 class PVideoInputDevice : public PVideoDevice
@@ -1035,6 +1045,13 @@
       BOOL startImmediate = TRUE          ///< Immediately start display
     );
 
+	/**Retrieve a list of Device Capabilities
+	  */
+	static BOOL GetDeviceCapabilities(
+      const PString & /*deviceName*/,           ///< Name of device
+	  InputDeviceCapabilities & /*caps*/        ///< List of supported capabilities
+	) { return FALSE; }
+
     /**Open the device given the device name.
       */
     virtual BOOL Open(
@@ -1089,6 +1106,8 @@
   public:
     virtual PObject *   CreateInstance(int /*userData*/) const { return new className; }
     virtual PStringList GetDeviceNames(int /*userData*/) const { return className::GetInputDeviceNames(); }
+	virtual BOOL GetDeviceCapabilities(const PString & deviceName, InputDeviceCapabilities & caps) const
+	                                  { return className::GetDeviceCapabilities(deviceName,caps); }
 };
 
 #define PCREATE_VIDINPUT_PLUGIN(name) \

Modified: ptlib/trunk/src/ptlib/common/vfakeio.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/vfakeio.cxx	2007-10-22 18:33:45 UTC (rev 18738)
+++ ptlib/trunk/src/ptlib/common/vfakeio.cxx	2007-10-22 18:36:06 UTC (rev 18739)
@@ -1488,6 +1488,13 @@
     virtual PStringList GetDeviceNames() const
       { return GetInputDeviceNames(); }
 
+	/**Retrieve a list of Device Capabilities
+	  */
+	static BOOL GetDeviceCapabilities(
+      const PString & /*deviceName*/,           ///< Name of device
+	  InputDeviceCapabilities & /*caps*/        ///< List of supported capabilities
+	  )  { return FALSE; }
+
     /**Get the maximum frame size in bytes.
 
        Note a particular device may be able to provide variable length

Modified: ptlib/trunk/src/ptlib/msos/vfw.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vfw.cxx	2007-10-22 18:33:45 UTC (rev 18738)
+++ ptlib/trunk/src/ptlib/msos/vfw.cxx	2007-10-22 18:36:06 UTC (rev 18739)
@@ -389,6 +389,13 @@
     virtual PStringList GetDeviceNames() const
       { return GetInputDeviceNames(); }
 
+	/**Retrieve a list of Device Capabilities
+	  */
+	static BOOL GetDeviceCapabilities(
+      const PString & /*deviceName*/,           ///< Name of device
+	  InputDeviceCapabilities & /*caps*/        ///< List of supported capabilities
+	  )  { return FALSE; }
+
     /**Open the device given the device name.
       */
     virtual BOOL Open(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18750] ptlib/trunk

From: <rjongbloed@us...> - 2007-10-23 05:10

Revision: 18750
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18750&view=rev
Author:   rjongbloed
Date:     2007-10-22 22:10:09 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Applied OpenH323 patch 1532400
Function to do interface selection based on remote address.
Thanks Drazen Dimoti (jimbosimo)

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/ipsock.h
    ptlib/trunk/src/ptlib/msos/ethsock.cxx

Modified: ptlib/trunk/include/ptlib/ipsock.h
===================================================================
--- ptlib/trunk/include/ptlib/ipsock.h	2007-10-23 04:14:53 UTC (rev 18749)
+++ ptlib/trunk/include/ptlib/ipsock.h	2007-10-23 05:10:09 UTC (rev 18750)
@@ -776,7 +776,16 @@
      */
     static PString GetGatewayInterface();
 
- #ifdef _WIN32
+    /** Get the interface address that will be used to reach the specified
+        remote address. Uses longest prefix match when multiple matching interfaces
+        are found.
+
+       @return
+       Network interface address.
+      */
+    static PIPSocket::Address GetRouteInterfaceAddress(PIPSocket::Address remoteAddress);
+
+#ifdef _WIN32
     /** Get the IP address for the interface that is being used as the gateway,
        that is, the interface that packets on the default route will be sent.
 

Modified: ptlib/trunk/src/ptlib/msos/ethsock.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/ethsock.cxx	2007-10-23 04:14:53 UTC (rev 18749)
+++ ptlib/trunk/src/ptlib/msos/ethsock.cxx	2007-10-23 05:10:09 UTC (rev 18750)
@@ -1994,6 +1994,57 @@
   return snmp.GetInterfaceName(ifNum);
 }
 
+
+PIPSocket::Address PIPSocket::GetRouteInterfaceAddress(PIPSocket::Address remoteAddress)
+{
+  PIPSocket::InterfaceTable hostInterfaceTable;
+  PIPSocket::GetInterfaceTable(hostInterfaceTable);
+
+  PIPSocket::RouteTable hostRouteTable;
+  PIPSocket::GetRouteTable(hostRouteTable);
+
+  if (hostInterfaceTable.IsEmpty())
+    return PIPSocket::GetDefaultIpAny();
+
+  for (PINDEX IfaceIdx = 0; IfaceIdx < hostInterfaceTable.GetSize(); IfaceIdx++) {
+    if (remoteAddress == hostInterfaceTable[IfaceIdx].GetAddress()) {
+      PTRACE(5, "PWLib\tRoute packet for " << remoteAddress
+             << " over interface " << hostInterfaceTable[IfaceIdx].GetName()
+             << "[" << hostInterfaceTable[IfaceIdx].GetAddress() << "]");
+      return hostInterfaceTable[IfaceIdx].GetAddress();
+    }
+  }
+
+  PIPSocket::RouteEntry * route = NULL;
+  for (PINDEX routeIdx = 0; routeIdx < hostRouteTable.GetSize(); routeIdx++) {
+    PIPSocket::RouteEntry & routeEntry = hostRouteTable[routeIdx];
+
+    DWORD network = (DWORD) routeEntry.GetNetwork();
+    DWORD mask = (DWORD) routeEntry.GetNetMask();
+
+    if (((DWORD)remoteAddress & mask) == network) {
+      if (route == NULL)
+        route = &routeEntry;
+      else if ((DWORD)routeEntry.GetNetMask() > (DWORD)route->GetNetMask())
+        route = &routeEntry;
+    }
+  }
+
+  if (route != NULL) {
+    for (PINDEX IfaceIdx = 0; IfaceIdx < hostInterfaceTable.GetSize(); IfaceIdx++) {
+      if (route->GetInterface() == hostInterfaceTable[IfaceIdx].GetName()) {
+        PTRACE(5, "PWLib\tRoute packet for " << remoteAddress
+               << " over interface " << hostInterfaceTable[IfaceIdx].GetName()
+               << "[" << hostInterfaceTable[IfaceIdx].GetAddress() << "]");
+        return hostInterfaceTable[IfaceIdx].GetAddress();
+      }
+    }
+  }
+
+  return PIPSocket::GetDefaultIpAny();
+}
+ 
+
 PIPSocket::Address PIPSocket::GetGatewayInterfaceAddress()
 {
   PWaitAndSignal m(GetSNMPMutex());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18752] ptlib/trunk

From: <rjongbloed@us...> - 2007-10-23 05:44

Revision: 18752
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18752&view=rev
Author:   rjongbloed
Date:     2007-10-22 22:44:04 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Applied OpenH323 patch 1703663
Hide control window in service simulation mode.
Thanks Fabrizio Ammollo (fammollo)

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/msos/ptlib/svcproc.h
    ptlib/trunk/src/ptlib/msos/svcproc.cxx

Modified: ptlib/trunk/include/ptlib/msos/ptlib/svcproc.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/svcproc.h	2007-10-23 05:36:42 UTC (rev 18751)
+++ ptlib/trunk/include/ptlib/msos/ptlib/svcproc.h	2007-10-23 05:44:04 UTC (rev 18752)
@@ -142,6 +142,7 @@
 
   protected:
     PCaselessString systemLogFileName;
+    BOOL debugHidden; /// Flag to indicate service is run in simulation mode without showing the control window 
 
   private:
     static void __stdcall StaticMainEntry(DWORD argc, LPTSTR * argv);

Modified: ptlib/trunk/src/ptlib/msos/svcproc.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/svcproc.cxx	2007-10-23 05:36:42 UTC (rev 18751)
+++ ptlib/trunk/src/ptlib/msos/svcproc.cxx	2007-10-23 05:44:04 UTC (rev 18752)
@@ -708,6 +708,9 @@
 
   debugMode = arguments.GetCount() > 0 && 
 	              (strcasecmp(arguments[0], "Debug") == 0 || strcasecmp(arguments[0], "foreground") == 0);
+  debugHidden = arguments.GetCount() > 0 && strcasecmp(arguments[0], "DebugHidden") == 0;
+  if (debugHidden)
+    debugMode=TRUE;
   currentLogLevel = debugMode ? PSystemLog::Info : PSystemLog::Warning;
 
   if (!debugMode && arguments.GetCount() > 0) {
@@ -1269,7 +1272,7 @@
   }
 
 
-  if (!IsWindowVisible(controlWindow))
+  if (!IsWindowVisible(controlWindow) && !debugHidden)
     ShowWindow(controlWindow, SW_SHOWDEFAULT);
 
   int len = strlen(out);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18757] ptlib/trunk

From: <rjongbloed@us...> - 2007-10-23 07:29

Revision: 18757
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18757&view=rev
Author:   rjongbloed
Date:     2007-10-23 00:29:26 -0700 (Tue, 23 Oct 2007)

Log Message:
-----------
Applied OpenH323 patch 1240291
Select() on the same socket from multiple threads (simul read/write)
Thanks Boris Pavacic - bpavacic

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/unix/ptlib/channel.h
    ptlib/trunk/src/ptlib/unix/channel.cxx
    ptlib/trunk/src/ptlib/unix/socket.cxx

Modified: ptlib/trunk/include/ptlib/unix/ptlib/channel.h
===================================================================
--- ptlib/trunk/include/ptlib/unix/ptlib/channel.h	2007-10-23 07:04:58 UTC (rev 18756)
+++ ptlib/trunk/include/ptlib/unix/ptlib/channel.h	2007-10-23 07:29:26 UTC (rev 18757)
@@ -128,8 +128,8 @@
     PThread   * px_readThread;
     PThread   * px_writeThread;
     PMutex      px_writeMutex;
-    PThread   * px_selectThread;
-    PMutex      px_selectMutex;
+    PThread   * px_selectThread[3];
+    PMutex      px_selectMutex[3];
 
 #endif //#ifndef __PCHANNEL_UNIX__ 
 

Modified: ptlib/trunk/src/ptlib/unix/channel.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/channel.cxx	2007-10-23 07:04:58 UTC (rev 18756)
+++ ptlib/trunk/src/ptlib/unix/channel.cxx	2007-10-23 07:29:26 UTC (rev 18757)
@@ -182,7 +182,9 @@
   px_lastBlockType = PXReadBlock;
   px_readThread = NULL;
   px_writeThread = NULL;
-  px_selectThread = NULL;
+  px_selectThread[0] = NULL;
+  px_selectThread[1] = NULL;
+  px_selectThread[2] = NULL;
 }
 
 
@@ -414,7 +416,9 @@
 
   AbortIO(px_readThread, px_threadMutex);
   AbortIO(px_writeThread, px_threadMutex);
-  AbortIO(px_selectThread, px_threadMutex);
+  AbortIO(px_selectThread[0], px_threadMutex);
+  AbortIO(px_selectThread[1], px_threadMutex);
+  AbortIO(px_selectThread[2], px_threadMutex);
 
   int stat;
   do {

Modified: ptlib/trunk/src/ptlib/unix/socket.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/socket.cxx	2007-10-23 07:04:58 UTC (rev 18756)
+++ ptlib/trunk/src/ptlib/unix/socket.cxx	2007-10-23 07:29:26 UTC (rev 18757)
@@ -552,8 +552,8 @@
         if (h > maxfds)
           maxfds = h;
       }
-      socket.px_selectMutex.Wait();
-      socket.px_selectThread = unblockThread;
+      socket.px_selectMutex[i].Wait();
+      socket.px_selectThread[i] = unblockThread;
     }
   }
 
@@ -572,8 +572,8 @@
   for (i = 0; i < 3; i++) {
     for (j = 0; j < list[i]->GetSize(); j++) {
       PSocket & socket = (*list[i])[j];
-      socket.px_selectThread = NULL;
-      socket.px_selectMutex.Signal();
+      socket.px_selectThread[i] = NULL;
+      socket.px_selectMutex[i].Signal();
       if (lastError == NoError) {
         int h = socket.GetHandle();
         if (h < 0)
@@ -614,8 +614,8 @@
         if (h > maxfds)
           maxfds = h;
       }
-      socket.px_selectMutex.Wait();
-      socket.px_selectThread = unblockThread;
+      socket.px_selectMutex[i].Wait();
+      socket.px_selectThread[i] = unblockThread;
     }
   }
 
@@ -644,8 +644,8 @@
   for (i = 0; i < 3; i++) {
     for (j = 0; j < list[i]->GetSize(); j++) {
       PSocket & socket = (*list[i])[j];
-      socket.px_selectThread = NULL;
-      socket.px_selectMutex.Signal();
+      socket.px_selectThread[i] = NULL;
+      socket.px_selectMutex[i].Signal();
       if (lastError == NoError) {
         int h = socket.GetHandle();
         if (h < 0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18762] ptlib/trunk

From: <shorne@us...> - 2007-10-24 21:02

Revision: 18762
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18762&view=rev
Author:   shorne
Date:     2007-10-24 14:02:32 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
Added GetDeviceCapabilities to all plugins

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/pvfiledev.h
    ptlib/trunk/include/ptlib/plugin.h
    ptlib/trunk/include/ptlib/pluginmgr.h
    ptlib/trunk/include/ptlib/videoio.h
    ptlib/trunk/src/ptlib/common/pluginmgr.cxx
    ptlib/trunk/src/ptlib/common/vfakeio.cxx
    ptlib/trunk/src/ptlib/common/videoio.cxx
    ptlib/trunk/src/ptlib/msos/vfw.cxx

Modified: ptlib/trunk/include/ptclib/pvfiledev.h
===================================================================
--- ptlib/trunk/include/ptclib/pvfiledev.h	2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/include/ptclib/pvfiledev.h	2007-10-24 21:02:32 UTC (rev 18762)
@@ -156,7 +156,7 @@
 	  */
 	static BOOL GetDeviceCapabilities(
       const PString & /*deviceName*/,           ///< Name of device
-	  InputDeviceCapabilities & /*caps*/        ///< List of supported capabilities
+	  InputDeviceCapabilities * /*caps*/        ///< List of supported capabilities
 	  )  { return FALSE; }
 
     /**Get the maximum frame size in bytes.

Modified: ptlib/trunk/include/ptlib/plugin.h
===================================================================
--- ptlib/trunk/include/ptlib/plugin.h	2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/include/ptlib/plugin.h	2007-10-24 21:02:32 UTC (rev 18762)
@@ -169,6 +169,8 @@
     virtual PObject *   CreateInstance(int userData) const = 0;
     virtual PStringList GetDeviceNames(int userData) const = 0;
     virtual bool        ValidateDeviceName(const PString & deviceName, int userData) const;
+	virtual bool        GetDeviceCapabilities(const PString & deviceName, 
+											         void * capabilities) const;
 };
 
 

Modified: ptlib/trunk/include/ptlib/pluginmgr.h
===================================================================
--- ptlib/trunk/include/ptlib/pluginmgr.h	2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/include/ptlib/pluginmgr.h	2007-10-24 21:02:32 UTC (rev 18762)
@@ -151,6 +151,7 @@
     PObject * CreatePluginsDevice(const PString & serviceName, const PString & serviceType, int userData = 0) const;
     PObject * CreatePluginsDeviceByName(const PString & deviceName, const PString & serviceType, int userData = 0, const PString & serviceName = PString::Empty()) const;
     PStringList GetPluginsDeviceNames(const PString & serviceName, const PString & serviceType, int userData = 0) const;
+    BOOL GetPluginsDeviceCapabilities(const PString & serviceType,const PString & serviceName,const PString & deviceName,void * capabilities) const;
 
     // function to register a service (used by the plugins themselves)
     BOOL RegisterService (const PString & serviceName, const PString & serviceType, PPluginServiceDescriptor * descriptor);

Modified: ptlib/trunk/include/ptlib/videoio.h
===================================================================
--- ptlib/trunk/include/ptlib/videoio.h	2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/include/ptlib/videoio.h	2007-10-24 21:02:32 UTC (rev 18762)
@@ -1048,10 +1048,20 @@
 	/**Retrieve a list of Device Capabilities
 	  */
 	static BOOL GetDeviceCapabilities(
-      const PString & /*deviceName*/,           ///< Name of device
-	  InputDeviceCapabilities & /*caps*/        ///< List of supported capabilities
-	) { return FALSE; }
+      const PString & deviceName,           ///< Name of device
+	  InputDeviceCapabilities * caps,       ///< List of supported capabilities
+	  PPluginManager * pluginMgr = NULL     ///< Plug in manager, use default if NULL
+	);
 
+	/**Retrieve a list of Device Capabilities for a particular driver
+	  */
+	static BOOL GetDeviceCapabilities(
+      const PString & deviceName,           ///< Name of device
+	  const PString & driverName,           ///< Device Driver
+	  InputDeviceCapabilities * caps,       ///< List of supported capabilities
+	  PPluginManager * pluginMgr = NULL     ///< Plug in manager, use default if NULL
+	);
+
     /**Open the device given the device name.
       */
     virtual BOOL Open(
@@ -1106,8 +1116,8 @@
   public:
     virtual PObject *   CreateInstance(int /*userData*/) const { return new className; }
     virtual PStringList GetDeviceNames(int /*userData*/) const { return className::GetInputDeviceNames(); }
-	virtual BOOL GetDeviceCapabilities(const PString & deviceName, InputDeviceCapabilities & caps) const
-	                                  { return className::GetDeviceCapabilities(deviceName,caps); }
+	virtual bool GetDeviceCapabilities(const PString & deviceName, void * caps) const
+	                       { return className::GetDeviceCapabilities(deviceName,(InputDeviceCapabilities *)caps); }
 };
 
 #define PCREATE_VIDINPUT_PLUGIN(name) \

Modified: ptlib/trunk/src/ptlib/common/pluginmgr.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/pluginmgr.cxx	2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/src/ptlib/common/pluginmgr.cxx	2007-10-24 21:02:32 UTC (rev 18762)
@@ -418,7 +418,13 @@
   return false;
 }
 
+bool PDevicePluginServiceDescriptor::GetDeviceCapabilities(const PString & /*deviceName*/, 
+														         void * /*capabilities*/) const
+{
+  return false;
+}
 
+
 PStringList PPluginManager::GetPluginsDeviceNames(const PString & serviceName,
                                                   const PString & serviceType,
                                                   int userData) const
@@ -469,7 +475,32 @@
   return allDevices;
 }
 
+BOOL PPluginManager::GetPluginsDeviceCapabilities(const PString & serviceType,
+	                                              const PString & serviceName,
+												  const PString & deviceName,
+                                                  void * capabilities) const
+{
+    if (serviceType.IsEmpty() || deviceName.IsEmpty()) 
+        return FALSE;
 
+	if (serviceName.IsEmpty() || serviceName == "*") {
+	  for (PINDEX i = 0; i < serviceList.GetSize(); i++) {
+		const PPluginService & service = serviceList[i];
+		if (service.serviceType *= serviceType) { 
+          PDevicePluginServiceDescriptor * desc = (PDevicePluginServiceDescriptor *)service.descriptor;
+          if (desc != NULL && desc->ValidateDeviceName(deviceName, 0))
+            return desc->GetDeviceCapabilities(deviceName,capabilities);
+		}
+	  }
+	} else {
+      PDevicePluginServiceDescriptor * desc = (PDevicePluginServiceDescriptor *)GetServiceDescriptor(serviceName, serviceType);
+       if (desc != NULL && desc->ValidateDeviceName(deviceName, 0))
+          return desc->GetDeviceCapabilities(deviceName,capabilities);
+	}
+
+    return FALSE;
+}
+
 BOOL PPluginManager::RegisterService(const PString & serviceName,
              const PString & serviceType,
              PPluginServiceDescriptor * descriptor)

Modified: ptlib/trunk/src/ptlib/common/vfakeio.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/vfakeio.cxx	2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/src/ptlib/common/vfakeio.cxx	2007-10-24 21:02:32 UTC (rev 18762)
@@ -1492,7 +1492,7 @@
 	  */
 	static BOOL GetDeviceCapabilities(
       const PString & /*deviceName*/,           ///< Name of device
-	  InputDeviceCapabilities & /*caps*/        ///< List of supported capabilities
+	  InputDeviceCapabilities * /*caps*/        ///< List of supported capabilities
 	  )  { return FALSE; }
 
     /**Get the maximum frame size in bytes.

Modified: ptlib/trunk/src/ptlib/common/videoio.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/videoio.cxx	2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/src/ptlib/common/videoio.cxx	2007-10-24 21:02:32 UTC (rev 18762)
@@ -1193,7 +1193,7 @@
   colourFormat = "RGB24";
   bytesPerPixel = 3;
   swappedRedAndBlue = false;
-  SetFrameSize(frameWidth, frameHeight);
+//  SetFrameSize(frameWidth, frameHeight);
 }
 
 
@@ -1202,22 +1202,22 @@
   PWaitAndSignal m(mutex);
 
   PINDEX newBytesPerPixel;
-  bool newSwappedRedAndBlue;
+
   if (colourFormat *= "RGB32") {
     newBytesPerPixel = 4;
-    newSwappedRedAndBlue = false;
+    swappedRedAndBlue = false;
   }
   else if (colourFormat *= "RGB24") {
     newBytesPerPixel = 3;
-    newSwappedRedAndBlue = false;
+    swappedRedAndBlue = false;
   }
   else if (colourFormat *= "BGR32") {
     newBytesPerPixel = 4;
-    newSwappedRedAndBlue = true;
+    swappedRedAndBlue = true;
   }
   else if (colourFormat *= "BGR24") {
     newBytesPerPixel = 3;
-    newSwappedRedAndBlue = true;
+    swappedRedAndBlue = true;
   }
   else
     return FALSE;
@@ -1408,7 +1408,21 @@
   return (PVideoInputDevice *)pluginMgr->CreatePluginsDeviceByName(deviceName, videoInputPluginBaseClass,0,driverName);
 }
 
+BOOL PVideoInputDevice::GetDeviceCapabilities(const PString & deviceName,InputDeviceCapabilities * caps, PPluginManager * pluginMgr)
+{
+	return GetDeviceCapabilities(deviceName, "*",caps,pluginMgr);
+}
 
+BOOL PVideoInputDevice::GetDeviceCapabilities(const PString & deviceName,const PString & driverName, InputDeviceCapabilities * caps, PPluginManager * pluginMgr)
+{
+  if (pluginMgr == NULL)
+    pluginMgr = &PPluginManager::GetPluginManager();
+
+  return pluginMgr->GetPluginsDeviceCapabilities(videoInputPluginBaseClass,driverName,deviceName, (void *)caps);
+}
+
+
+
 PVideoInputDevice * PVideoInputDevice::CreateOpenedDevice(const PString & driverName,
                                                           const PString & deviceName,
                                                           BOOL startImmediate,
@@ -1442,7 +1456,6 @@
   return NULL;
 }
 
-
 BOOL PVideoInputDevice::GetFrame(PBYTEArray & frame)
 {
   PINDEX returned;

Modified: ptlib/trunk/src/ptlib/msos/vfw.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vfw.cxx	2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/src/ptlib/msos/vfw.cxx	2007-10-24 21:02:32 UTC (rev 18762)
@@ -393,7 +393,7 @@
 	  */
 	static BOOL GetDeviceCapabilities(
       const PString & /*deviceName*/,           ///< Name of device
-	  InputDeviceCapabilities & /*caps*/        ///< List of supported capabilities
+	  InputDeviceCapabilities * /*caps*/        ///< List of supported capabilities
 	  )  { return FALSE; }
 
     /**Open the device given the device name.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18789] ptlib/trunk

From: <csoutheren@us...> - 2007-11-04 11:05

Revision: 18789
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18789&view=rev
Author:   csoutheren
Date:     2007-11-04 03:05:34 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
Use inet_ntop when available
Use PCriticalSection on inet_ntoa

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in
    ptlib/trunk/src/ptlib/common/sockets.cxx

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2007-11-04 10:10:22 UTC (rev 18788)
+++ ptlib/trunk/configure	2007-11-04 11:05:34 UTC (rev 18789)
@@ -7874,11 +7874,72 @@
 fi
 
 HAS_IPV6=
+HAS_INET_NTOP=
 
 if test "$enable_ipv6" = "no" ; then
   { echo "$as_me:$LINENO: IPV6 disabled" >&5
 echo "$as_me: IPV6 disabled" >&6;}
+  echo "$as_me:$LINENO: checking for inet_ntop" >&5
+echo $ECHO_N "checking for inet_ntop... $ECHO_C" >&6
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+                  #include <netinet/in.h>
+                  #include <arpa/inet.h>
+int
+main ()
+{
+int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  HAS_INET_NTOP=yes
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+HAS_INET_NTOP=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test $HAS_INET_NTOP = no ; then
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define P_HAS_INET_NTOP 1
+_ACEOF
+
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  fi
+else
   echo "$as_me:$LINENO: checking for IPv6 support" >&5
 echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2007-11-04 10:10:22 UTC (rev 18788)
+++ ptlib/trunk/configure.ac	2007-11-04 11:05:34 UTC (rev 18789)
@@ -1582,9 +1582,21 @@
 fi
 
 HAS_IPV6=
+HAS_INET_NTOP=
 
 if test "$enable_ipv6" = "no" ; then
   AC_MSG_NOTICE(IPV6 disabled)
+  AC_MSG_CHECKING(for inet_ntop)
+  AC_TRY_COMPILE([#include <sys/types.h>
+                  #include <netinet/in.h>
+                  #include <arpa/inet.h>],
+                  [int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);], HAS_INET_NTOP=yes, HAS_INET_NTOP=no)
+  if test $HAS_INET_NTOP = no ; then
+    AC_MSG_RESULT(no)
+  else
+    AC_DEFINE(P_HAS_INET_NTOP, 1)
+    AC_MSG_RESULT(yes)
+  fi
 else
   AC_MSG_CHECKING(for IPv6 support)
   AC_TRY_COMPILE([#include <sys/types.h>

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2007-11-04 10:10:22 UTC (rev 18788)
+++ ptlib/trunk/include/ptbuildopts.h.in	2007-11-04 11:05:34 UTC (rev 18789)
@@ -772,6 +772,7 @@
 #undef  PMEMORY_CHECK
 #undef  P_HAS_RECVMSG
 #undef  P_HAS_UPAD128_T
+#undef  P_HAS_INET_NTOP
 
 #endif // _PT_BUILDOPTS_H
 

Modified: ptlib/trunk/src/ptlib/common/sockets.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/sockets.cxx	2007-11-04 10:10:22 UTC (rev 18788)
+++ ptlib/trunk/src/ptlib/common/sockets.cxx	2007-11-04 11:05:34 UTC (rev 18789)
@@ -2520,14 +2520,24 @@
     str.MakeMinimumSize();
     return str;
   }
-#endif
-#ifdef P_VXWORKS
+
+#elif defined(P_VXWORKS)
   char ipStorage[INET_ADDR_LEN];
   inet_ntoa_b(v.four, ipStorage);
   return ipStorage;    
-#else // P_VXWORKS
+
+#elif defined(P_HAS_INET_NTOP)
+  static PCriticalSection m;
   return inet_ntoa(v.four);
-#endif // P_VXWORKS
+
+#else
+
+  PString str;
+  if (inet_ntop(AF_INET, sa, str.GetPointer(INET_ADDRSTRLEN), INET_ADDRSTRLEN) == NULL)
+    return PString::Empty()
+  return str;
+
+#endif 
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18792] ptlib/trunk

From: <csoutheren@us...> - 2007-11-04 12:01

Revision: 18792
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18792&view=rev
Author:   csoutheren
Date:     2007-11-04 04:01:51 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
Allow SNMP and HTTPSVC to be disabled on Windows builds

Modified Paths:
--------------
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptclib/http.h
    ptlib/trunk/include/ptclib/httpform.h
    ptlib/trunk/src/ptclib/httpsrvr.cxx
    ptlib/trunk/src/ptclib/httpsvc.cxx
    ptlib/trunk/src/ptclib/psnmp.cxx
    ptlib/trunk/src/ptclib/shttpsvc.cxx
    ptlib/trunk/src/ptclib/snmpclnt.cxx

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/configure.ac	2007-11-04 12:01:51 UTC (rev 18792)
@@ -2064,6 +2064,7 @@
 
 dnl MSWIN_DISPLAY    httpsvc,HTTP service Support
 dnl MSWIN_DEFINE     httpsvc,P_HTTPSVC
+dnl MSWIN_IF_FEATURE httpsvc,!http
 
 AC_ARG_ENABLE(httpsvc,
        [  --disable-httpsvc       disable HTTP service support])

Modified: ptlib/trunk/include/ptclib/http.h
===================================================================
--- ptlib/trunk/include/ptclib/http.h	2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/include/ptclib/http.h	2007-11-04 12:01:51 UTC (rev 18792)
@@ -246,8 +246,6 @@
 #include <ptlib/ipsock.h>
 
 
-#ifdef P_HTTPSVC
-
 #include <ptclib/html.h>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -355,8 +353,6 @@
     BOOL SetSize(PINDEX) { return FALSE; }
 };
 
-#endif // P_HTTPSVC
-
 #ifdef _WIN32_WCE
 #undef TRACE
 #endif
@@ -634,8 +630,6 @@
     PString userAgentName;
 };
 
-#ifdef P_HTTPSVC
-
 //////////////////////////////////////////////////////////////////////////////
 // PMultipartFormInfo
 
@@ -1904,9 +1898,7 @@
     PFilePath realPath;
 };
 
-#endif // P_HTTPSVC
+#endif // _PHTTP
 
-#endif
 
-
 // End Of File ///////////////////////////////////////////////////////////////

Modified: ptlib/trunk/include/ptclib/httpform.h
===================================================================
--- ptlib/trunk/include/ptclib/httpform.h	2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/include/ptclib/httpform.h	2007-11-04 12:01:51 UTC (rev 18792)
@@ -90,6 +90,7 @@
 #endif
 
 #include <ptclib/http.h>
+#include <ptclib/html.h>
 
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptclib/httpsrvr.cxx
===================================================================
--- ptlib/trunk/src/ptclib/httpsrvr.cxx	2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/httpsrvr.cxx	2007-11-04 12:01:51 UTC (rev 18792)
@@ -186,6 +186,7 @@
  */
 
 #include <ptlib.h>
+#include <ptbuildopts.h>
 
 #ifdef P_HTTP
 

Modified: ptlib/trunk/src/ptclib/httpsvc.cxx
===================================================================
--- ptlib/trunk/src/ptclib/httpsvc.cxx	2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/httpsvc.cxx	2007-11-04 12:01:51 UTC (rev 18792)
@@ -345,6 +345,10 @@
 #endif
 
 #include <ptlib.h>
+#include <ptbuildopts.h>
+
+#ifdef P_HTTPSVC
+
 #include <ptclib/httpsvc.h>
 #include <ptlib/sockets.h>
 
@@ -2055,5 +2059,6 @@
   return TRUE;
 }
 
+#endif // P_HTTPSVC
 
 ///////////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptclib/psnmp.cxx
===================================================================
--- ptlib/trunk/src/ptclib/psnmp.cxx	2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/psnmp.cxx	2007-11-04 12:01:51 UTC (rev 18792)
@@ -83,6 +83,9 @@
 #endif
 
 #include <ptlib.h>
+#include <ptbuildopts.h>
+
+#ifdef P_SNMP
 #include <ptclib/psnmp.h>
 
 #define new PNEW
@@ -192,5 +195,6 @@
     return SnmpErrorCodeTable[err];
 }
 
+#endif // P_SNMP
 
 // End Of File ///////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptclib/shttpsvc.cxx
===================================================================
--- ptlib/trunk/src/ptclib/shttpsvc.cxx	2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/shttpsvc.cxx	2007-11-04 12:01:51 UTC (rev 18792)
@@ -65,15 +65,17 @@
  *
  */
 
-#include <ptlib.h>
-
 #ifdef __GNUC__
 #pragma implementation "shttpsvc.h"
 #endif
 
+#include <ptlib.h>
+#include <ptbuildopts.h>
+
+#ifdef P_HTTPSVC
+
 #include <ptclib/shttpsvc.h>
 
-
 #ifdef P_SSL
 
 class HTTP_PSSLChannel : public PSSLChannel
@@ -270,4 +272,6 @@
 
 #endif //P_SSL
 
+#endif // P_HTTPSVC
+
 // End Of File ///////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptclib/snmpclnt.cxx
===================================================================
--- ptlib/trunk/src/ptclib/snmpclnt.cxx	2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/snmpclnt.cxx	2007-11-04 12:01:51 UTC (rev 18792)
@@ -57,6 +57,10 @@
  */
 
 #include <ptlib.h>
+#include <ptbuildopts.h>
+
+#ifdef P_SNMP
+
 #include <ptclib/psnmp.h>
 
 #define new PNEW
@@ -496,5 +500,6 @@
   channel.Write(sendBuffer, sendBuffer.GetSize());
 }
 
+#endif // P_SNMP
 
 // End Of File ///////////////////////////////////////////////////////////////


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18793] ptlib/trunk

From: <dsandras@us...> - 2007-11-04 20:31

Revision: 18793
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18793&view=rev
Author:   dsandras
Date:     2007-11-04 12:31:31 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
Fixed Mingw compilation thanks to Matthias Schneider <ma30002000 yahoo de>.
Many thanks!

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/pdns.h
    ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
    ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx

Modified: ptlib/trunk/include/ptclib/pdns.h
===================================================================
--- ptlib/trunk/include/ptclib/pdns.h	2007-11-04 12:01:51 UTC (rev 18792)
+++ ptlib/trunk/include/ptclib/pdns.h	2007-11-04 20:31:31 UTC (rev 18793)
@@ -89,9 +89,11 @@
 #  pragma comment(lib, P_DNS_LIBRARY)
 
 // Accommodate spelling error in windns.h
+#ifndef __MINGW32__
 enum { DnsSectionAdditional = DnsSectionAddtional };
+#endif
 
-#else
+#else /* WIN32 */
 
 #  define  P_HAS_RESOLVER 1         // set if using Unix-style DNS routines
 #  include <arpa/nameser.h>

Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2007-11-04 12:01:51 UTC (rev 18792)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2007-11-04 20:31:31 UTC (rev 18793)
@@ -118,7 +118,7 @@
      */
     static BOOL GetDeviceCapabilities(
           const PString & deviceName,           ///< Name of device
-	  InputDeviceCapabilities & caps        ///< List of supported capabilities
+	  InputDeviceCapabilities * caps        ///< List of supported capabilities
     );
 
 

Modified: ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2007-11-04 12:01:51 UTC (rev 18792)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2007-11-04 20:31:31 UTC (rev 18793)
@@ -1038,7 +1038,7 @@
 }
 
 
-BOOL PVideoInputDevice_DirectShow::GetDeviceCapabilities(const PString & /*deviceName*/,InputDeviceCapabilities & /*caps*/)  
+BOOL PVideoInputDevice_DirectShow::GetDeviceCapabilities(const PString & /*deviceName*/,InputDeviceCapabilities * /*caps*/)  
 { 
     // To do!
     return FALSE; 
@@ -1338,7 +1338,7 @@
 }
 
 
-struct {
+const static struct {
     char *pwlib_format;
     GUID  media_format;
 } formats[] =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18810] ptlib/trunk

From: <shorne@us...> - 2007-11-05 08:58

Revision: 18810
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18810&view=rev
Author:   shorne
Date:     2007-11-05 00:58:23 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
added windows application video Input 

Modified Paths:
--------------
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in
    ptlib/trunk/src/ptlib/msos/Console.vcproj

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2007-11-05 08:57:51 UTC (rev 18809)
+++ ptlib/trunk/configure.ac	2007-11-05 08:58:23 UTC (rev 18810)
@@ -2155,6 +2155,33 @@
 AC_SUBST(HAS_VIDFILE)
 
 dnl ########################################################################
+dnl check for enabling app share support
+
+dnl MSWIN_DISPLAY    appshare,Application share support
+dnl MSWIN_DEFINE     appshare,P_APPSHARE
+
+if test "$HAS_VIDEO" \!= "1" ; then
+  default_appshare=no
+fi
+
+AC_ARG_ENABLE(vidfile,
+       [  --enable-appshare        enable Application share support])
+
+if test "${enable_appshare}z" = "z" ; then
+  enable_vidfile=$default_appshare
+fi
+
+HAS_APPSHARE=
+if test "$enable_appshare" = "no" ; then
+  AC_MSG_NOTICE(Application share support disabled)
+else
+  AC_MSG_NOTICE(Application share enabled)
+  HAS_APPSHARE=1
+  AC_DEFINE(P_APPSHARE, 1)
+fi
+AC_SUBST(HAS_APPSHARE)
+
+dnl ########################################################################
 dnl check for sound support
 
 dnl MSWIN_DISPLAY audio,Sound support

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2007-11-05 08:57:51 UTC (rev 18809)
+++ ptlib/trunk/include/ptbuildopts.h.in	2007-11-05 08:58:23 UTC (rev 18810)
@@ -649,7 +649,16 @@
 
 #endif
 
+/////////////////////////////////////////////////
+//
+// APP Share Input 
+//
+#undef P_APPSHARE
 
+#if defined(_MSC_VER) && P_APPSHARE
+#pragma include_alias(<ptlib/vidinput_app.h>, <ptlib/msos/ptlib/vidinput_app.h>)
+#endif
+
 /////////////////////////////////////////////////
 //
 // Runtime dynamic link libraries

Modified: ptlib/trunk/src/ptlib/msos/Console.vcproj
===================================================================
--- ptlib/trunk/src/ptlib/msos/Console.vcproj	2007-11-05 08:57:51 UTC (rev 18809)
+++ ptlib/trunk/src/ptlib/msos/Console.vcproj	2007-11-05 08:58:23 UTC (rev 18810)
@@ -1,2099 +1,2105 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="PTLib Static"
-	ProjectGUID="{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\..\Lib"
-			IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\include"
-				PreprocessorDefinitions="_DEBUG;_LIB;PTRACING=1"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="ptlib.h"
-				ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
-				BrowseInformation="1"
-				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\ptlibsd.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="3081"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\..\Lib"
-			IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\..\..\include"
-				PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=1"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="ptlib.h"
-				ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\ptlibs.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="3081"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="No Trace|Win32"
-			OutputDirectory="..\..\..\Lib"
-			IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\..\..\include"
-				PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=0"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="ptlib.h"
-				ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\ptlibsn.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="3081"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90">
-			<File
-				RelativePath="..\..\ptclib\asnber.cxx">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\asner.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\asnper.cxx">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\asnxer.cxx">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="assert.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="1"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\collect.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\contain.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\cypher.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\delaychan.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\dtmf.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\enum.cxx">
-			</File>
-			<File
-				RelativePath="ethsock.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\ftp.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\ftpclnt.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\ftpsrvr.cxx">
-			</File>
-			<File
-				RelativePath="..\common\getdate.y">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="bison -o ../common/getdate_tab.c ../common/getdate.y
-"
-						Outputs="../common/getdate_tab.c"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="bison -o ../common/getdate_tab.c ../common/getdate.y
-"
-						Outputs="../common/getdate_tab.c"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="bison -o ../common/getdate_tab.c ../common/getdate.y
-"
-						Outputs="../common/getdate_tab.c"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\getdate_tab.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						InlineFunctionExpansion="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						InlineFunctionExpansion="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\guid.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\html.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\http.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\httpclnt.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\httpform.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\httpsrvr.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\httpsvc.cxx">
-			</File>
-			<File
-				RelativePath="icmp.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\inetmail.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\inetprot.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\ipacl.cxx">
-			</File>
-			<File
-				RelativePath="mail.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\memfile.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\modem.cxx">
-			</File>
-			<File
-				RelativePath="..\common\notifier_ext.cxx">
-			</File>
-			<File
-				RelativePath="..\common\object.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\osutils.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pasn.cxx">
-			</File>
-			<File
-				RelativePath="..\Common\pchannel.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\Common\pconfig.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pdns.cxx">
-			</File>
-			<File
-				RelativePath="..\common\pethsock.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pils.cxx">
-			</File>
-			<File
-				RelativePath="pipe.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\pipechan.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pldap.cxx">
-			</File>
-			<File
-				RelativePath="..\common\pluginmgr.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pnat.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\podbc.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\psasl.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\psnmp.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\psoap.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\psockbun.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pssl.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pstun.cxx">
-			</File>
-			<File
-				RelativePath="..\common\ptime.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="ptlib.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\ptts.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pvfiledev.cxx">
-			</File>
-			<File
-				RelativePath="..\common\pvidchan.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pvidfile.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pwavfile.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pwavfiledev.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pxml.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pxmlrpc.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\pxmlrpcs.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\qchannel.cxx">
-			</File>
-			<File
-				RelativePath="..\common\qos.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\random.cxx">
-			</File>
-			<File
-				RelativePath="remconn.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\rfc1155.cxx">
-			</File>
-			<File
-				RelativePath="..\common\safecoll.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\Common\serial.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\sfile.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\shttpsvc.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\snmp.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\snmpclnt.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\snmpserv.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\sockagg.cxx">
-			</File>
-			<File
-				RelativePath="..\common\sockets.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\socks.cxx">
-			</File>
-			<File
-				RelativePath="..\common\sound.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\sound_directsound.cxx">
-			</File>
-			<File
-				RelativePath="sound_win32.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="svcproc.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\telnet.cxx">
-			</File>
-			<File
-				RelativePath="..\common\vconvert.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\vfakeio.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="vfw.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\videoio.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\vsdl.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\vxml.cxx">
-			</File>
-			<File
-				RelativePath="win32.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="wincfg.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="winserial.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="winsock.cxx">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\ptclib\xmpp.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\xmpp_c2s.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\xmpp_muc.cxx">
-			</File>
-			<File
-				RelativePath="..\..\ptclib\xmpp_roster.cxx">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd">
-			<File
-				RelativePath="..\..\..\include\ptbuildopts.h">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ptbuildopts.h.in">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Configuring Build Options"
-						CommandLine="cd ..\..\..
-configure --exclude-env=VSNET_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%
-"
-						Outputs="$(InputDir)ptbuildopts.h"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Configuring Build Options"
-						CommandLine="cd ..\..\..
-configure --exclude-env=VSNET_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%
-"
-						AdditionalDependencies="..\..\..\configure.ac"
-						Outputs="$(InputDir)ptbuildopts.h"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Configuring Build Options"
-						CommandLine="cd ..\..\..
-configure --exclude-env=VSNET_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%
-"
-						AdditionalDependencies="..\..\..\configure.ac"
-						Outputs="$(InputDir)ptbuildopts.h"/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="Common"
-				Filter="">
-				<File
-					RelativePath="..\..\..\Include\PtLib\Args.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Array.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\asnber.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\asner.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\asnper.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\asnxer.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Channel.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Config.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Contain.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\critsec.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\cypher.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\delaychan.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Dict.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\dtmf.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Dynalink.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\enum.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Ethsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\File.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\filepath.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\ftp.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\guid.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\html.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\http.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\httpform.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\httpsvc.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Icmpsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Indchan.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\inetmail.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\inetprot.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\ipacl.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Ipdsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\ipsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\ipxsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Lists.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Mail.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\memfile.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\mime.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\modem.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\mutex.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\notifier.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\notifier_ext.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\object.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pasn.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Pdirect.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pdns.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\pfactory.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pils.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Pipechan.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pldap.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\plugin.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\pluginmgr.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\podbc.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\pprocess.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\psasl.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\psnmp.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\psoap.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\psockbun.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pssl.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Pstring.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pstun.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\psync.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Ptime.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\ptts.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pvfiledev.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pvidfile.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pwavfile.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pwavfiledev.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pxml.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pxmlrpc.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\pxmlrpcs.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\qchannel.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\random.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Remconn.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\rfc1155.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\safecoll.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\semaphor.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Serchan.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Sfile.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\shttpsvc.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\snmp.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\sockagg.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\socket.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\sockets.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\socks.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Sound.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\spxsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Svcproc.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\syncpoint.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\syncthrd.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Tcpsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\telnet.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Textfile.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\thread.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Timeint.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Timer.h">
-				</File>
-				<File
-					RelativePath="..\..\..\Include\PtLib\Udpsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\url.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\vconvert.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\videoio.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\vsdl.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\vxml.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\xmpp.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\xmpp_c2s.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\xmpp_muc.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptclib\xmpp_roster.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="MSOS"
-				Filter="">
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\channel.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\config.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\contain.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\critsec.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\debstrm.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\dynalink.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\epacket.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\ethsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\file.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\filepath.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\icmpsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\ipdsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\ipsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\ipxsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\mail.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\mutex.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\pdirect.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\pipechan.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\pprocess.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\ptime.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\remconn.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\semaphor.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\serchan.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\sfile.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\socket.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\sound_directsound.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\spxsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\svcproc.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\syncpoint.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\tcpsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\textfile.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\thread.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\timeint.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\timer.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\udpsock.h">
-				</File>
-				<File
-					RelativePath="..\..\..\include\ptlib\msos\ptlib\videoio.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Inlines"
-			Filter=".inl">
-			<File
-				RelativePath="..\..\..\include\ptlib\contain.inl">
-			</File>
-			<File
-				RelativePath="..\..\..\include\ptlib\osutil.inl">
-			</File>
-			<File
-				RelativePath="..\..\..\include\ptlib\msos\ptlib\ptlib.inl">
-			</File>
-		</Filter>
-		<Filter
-			Name="Regex"
-			Filter="">
-			<File
-				RelativePath="..\common\regex\regcomp.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-						WarningLevel="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						WarningLevel="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						WarningLevel="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\regex\regerror.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-						WarningLevel="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						WarningLevel="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						WarningLevel="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\regex\regexec.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-						WarningLevel="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						WarningLevel="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						WarningLevel="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common\regex\regfree.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-						WarningLevel="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						WarningLevel="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="No Trace|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						WarningLevel="1"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\..\configure.ac">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="PTLib Static"
+	ProjectGUID="{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\..\Lib"
+			IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\include"
+				PreprocessorDefinitions="_DEBUG;_LIB;PTRACING=1"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
+				BrowseInformation="1"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\ptlibsd.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="3081"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\..\Lib"
+			IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\include"
+				PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=1"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\ptlibs.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="3081"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\..\Lib"
+			IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\..\include"
+				PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=0"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\ptlibsn.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="3081"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90">
+			<File
+				RelativePath="..\..\ptclib\asnber.cxx">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\asner.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\asnper.cxx">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\asnxer.cxx">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="assert.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\common\collect.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\common\contain.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\cypher.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\delaychan.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\dtmf.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\enum.cxx">
+			</File>
+			<File
+				RelativePath="ethsock.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\ftp.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\ftpclnt.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\ftpsrvr.cxx">
+			</File>
+			<File
+				RelativePath="..\common\getdate.y">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="bison -o ../common/getdate_tab.c ../common/getdate.y
+"
+						Outputs="../common/getdate_tab.c"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="bison -o ../common/getdate_tab.c ../common/getdate.y
+"
+						Outputs="../common/getdate_tab.c"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="bison -o ../common/getdate_tab.c ../common/getdate.y
+"
+						Outputs="../common/getdate_tab.c"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\common\getdate_tab.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						InlineFunctionExpansion="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						InlineFunctionExpansion="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\guid.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\html.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\http.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\httpclnt.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\httpform.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\httpsrvr.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\httpsvc.cxx">
+			</File>
+			<File
+				RelativePath="icmp.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\inetmail.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\inetprot.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\ipacl.cxx">
+			</File>
+			<File
+				RelativePath="mail.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\memfile.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\modem.cxx">
+			</File>
+			<File
+				RelativePath="..\common\notifier_ext.cxx">
+			</File>
+			<File
+				RelativePath="..\common\object.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\common\osutils.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pasn.cxx">
+			</File>
+			<File
+				RelativePath="..\Common\pchannel.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\Common\pconfig.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pdns.cxx">
+			</File>
+			<File
+				RelativePath="..\common\pethsock.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pils.cxx">
+			</File>
+			<File
+				RelativePath="pipe.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\common\pipechan.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pldap.cxx">
+			</File>
+			<File
+				RelativePath="..\common\pluginmgr.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pnat.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\podbc.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\psasl.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\psnmp.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\psoap.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\psockbun.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pssl.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pstun.cxx">
+			</File>
+			<File
+				RelativePath="..\common\ptime.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ptlib.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\ptts.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pvfiledev.cxx">
+			</File>
+			<File
+				RelativePath="..\common\pvidchan.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pvidfile.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pwavfile.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pwavfiledev.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pxml.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pxmlrpc.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\pxmlrpcs.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\qchannel.cxx">
+			</File>
+			<File
+				RelativePath="..\common\qos.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\random.cxx">
+			</File>
+			<File
+				RelativePath="remconn.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\rfc1155.cxx">
+			</File>
+			<File
+				RelativePath="..\common\safecoll.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\Common\serial.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\common\sfile.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\shttpsvc.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\snmp.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\snmpclnt.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\snmpserv.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\sockagg.cxx">
+			</File>
+			<File
+				RelativePath="..\common\sockets.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\socks.cxx">
+			</File>
+			<File
+				RelativePath="..\common\sound.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\sound_directsound.cxx">
+			</File>
+			<File
+				RelativePath="sound_win32.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="svcproc.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\telnet.cxx">
+			</File>
+			<File
+				RelativePath="..\common\vconvert.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\common\vfakeio.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="vfw.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\common\videoio.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\vidinput_app.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\vsdl.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\vxml.cxx">
+			</File>
+			<File
+				RelativePath="win32.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="wincfg.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="winserial.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="winsock.cxx">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ptclib\xmpp.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\xmpp_c2s.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\xmpp_muc.cxx">
+			</File>
+			<File
+				RelativePath="..\..\ptclib\xmpp_roster.cxx">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;fi;fd">
+			<File
+				RelativePath="..\..\..\include\ptbuildopts.h">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine=""/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\include\ptbuildopts.h.in">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Configuring Build Options"
+						CommandLine="cd ..\..\..
+configure --exclude-env=VSNET_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%
+"
+						Outputs="$(InputDir)ptbuildopts.h"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Configuring Build Options"
+						CommandLine="cd ..\..\..
+configure --exclude-env=VSNET_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%
+"
+						AdditionalDependencies="..\..\..\configure.ac"
+						Outputs="$(InputDir)ptbuildopts.h"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Configuring Build Options"
+						CommandLine="cd ..\..\..
+configure --exclude-env=VSNET_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%
+"
+						AdditionalDependencies="..\..\..\configure.ac"
+						Outputs="$(InputDir)ptbuildopts.h"/>
+				</FileConfiguration>
+			</File>
+			<Filter
+				Name="Common"
+				Filter="">
+				<File
+					RelativePath="..\..\..\Include\PtLib\Args.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Array.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\asnber.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\asner.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\asnper.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\asnxer.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Channel.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Config.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Contain.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\critsec.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\cypher.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\delaychan.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Dict.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\dtmf.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Dynalink.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\enum.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Ethsock.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\File.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\filepath.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\ftp.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\guid.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\html.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\http.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\httpform.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\httpsvc.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Icmpsock.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Indchan.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\inetmail.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\inetprot.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\ipacl.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Ipdsock.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\ipsock.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\ipxsock.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Lists.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Mail.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\memfile.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\mime.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\modem.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\mutex.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\notifier.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\notifier_ext.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\object.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pasn.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Pdirect.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pdns.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\pfactory.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pils.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Pipechan.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pldap.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\plugin.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\pluginmgr.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\podbc.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\pprocess.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\psasl.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\psnmp.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\psoap.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\psockbun.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pssl.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Pstring.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pstun.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\psync.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Ptime.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\ptts.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pvfiledev.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pvidfile.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pwavfile.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pwavfiledev.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pxml.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pxmlrpc.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\pxmlrpcs.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\qchannel.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\random.h">
+				</File>
+				<File
+					RelativePath="..\..\..\Include\PtLib\Remconn.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptclib\rfc1155.h">
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\safecoll.h">
+				</File>
+				<File

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18815] ptlib/trunk

From: <csoutheren@us...> - 2007-11-05 12:23

Revision: 18815
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18815&view=rev
Author:   csoutheren
Date:     2007-11-05 04:23:10 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
Fix problem with inet_ntop addition

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/configure.ac
    ptlib/trunk/src/ptlib/common/sockets.cxx

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2007-11-05 12:22:36 UTC (rev 18814)
+++ ptlib/trunk/configure	2007-11-05 12:23:10 UTC (rev 18815)
@@ -310,7 +310,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PTLIBDIR PTINSTDIR INSTALLPREFIX LIBDIR MAJOR_VERSION MINOR_VERSION BUILD_NUMBER PTLIB_VERSION BUILD_TYPE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MACHTYPE OSTYPE OSRELEASE TARGETDIR USE_GCC USE_PCH SHAREDLIBEXT CXXCPP EGREP FLEX AR BISON HAS_REGEX HAS_PLUGINS HAS_RESOLVER HAS_SASL HAS_SASL2 HAS_OPENLDAP HAS_OPENSSL P_STATIC_ENDLDLIBS P_STATIC_LDFLAGS HAS_EXPAT HAS_VXML HAS_JABBER HAS_XMLRPC HAS_SOAP HAS_TTS HAS_IPV6 HAS_SDL HAS_VIDEO HAS_VIDEO_CAPTURE USE_SHM_VIDEO_DEVICES HAS_ASN HAS_STUN HAS_PIPECHAN HAS_DTMF HAS_WAVFILE HAS_SOCKS HAS_FTP HAS_SNMP HAS_TELNET HAS_REMCONN HAS_SERIAL HAS_POP3SMTP HAS_HTTP HAS_HTTPSVC HAS_CONFIG_FILE HAS_SOCKAGG HAS_VIDFILE HAS_AUDIO HAS_OSS HAS_ALSA HAS_ODBC STDCCFLAGS STDCXXFLAGS OPTSTDCCFLAGS ENDLDLIBS DEBUG_FLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PTLIBDIR PTINSTDIR INSTALLPREFIX LIBDIR MAJOR_VERSION MINOR_VERSION BUILD_NUMBER PTLIB_VERSION BUILD_TYPE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MACHTYPE OSTYPE OSRELEASE TARGETDIR USE_GCC USE_PCH SHAREDLIBEXT CXXCPP EGREP FLEX AR BISON HAS_REGEX HAS_PLUGINS HAS_RESOLVER HAS_SASL HAS_SASL2 HAS_OPENLDAP HAS_OPENSSL P_STATIC_ENDLDLIBS P_STATIC_LDFLAGS HAS_EXPAT HAS_VXML HAS_JABBER HAS_XMLRPC HAS_SOAP HAS_TTS HAS_IPV6 HAS_SDL HAS_VIDEO HAS_VIDEO_CAPTURE USE_SHM_VIDEO_DEVICES HAS_ASN HAS_STUN HAS_PIPECHAN HAS_DTMF HAS_WAVFILE HAS_SOCKS HAS_FTP HAS_SNMP HAS_TELNET HAS_REMCONN HAS_SERIAL HAS_POP3SMTP HAS_HTTP HAS_HTTPSVC HAS_CONFIG_FILE HAS_SOCKAGG HAS_VIDFILE HAS_APPSHARE HAS_AUDIO HAS_OSS HAS_ALSA HAS_ODBC STDCCFLAGS STDCXXFLAGS OPTSTDCCFLAGS ENDLDLIBS DEBUG_FLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -889,6 +889,7 @@
   --disable-configfile    disable config file support
   --enable-sockagg        enable socket aggregation (experimental)
   --enable-vidfile        enable video file support
+  --enable-appshare        enable Application share support
   --disable-audio         disable audio support
   --enable-alsa           enable ALSA audio support
   --enable-oss            enable OSS audio support
@@ -7874,13 +7875,13 @@
 fi
 
 HAS_IPV6=
-HAS_INET_NTOP=
 
 if test "$enable_ipv6" = "no" ; then
   { echo "$as_me:$LINENO: IPV6 disabled" >&5
 echo "$as_me: IPV6 disabled" >&6;}
-  echo "$as_me:$LINENO: checking for inet_ntop" >&5
-echo $ECHO_N "checking for inet_ntop... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking for IPv6 support" >&5
+echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7889,11 +7890,10 @@
 /* end confdefs.h.  */
 #include <sys/types.h>
                   #include <netinet/in.h>
-                  #include <arpa/inet.h>
 int
 main ()
 {
-int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);
+struct sockaddr_in6 s; s.sin6_scope_id = 0;
   ;
   return 0;
 }
@@ -7920,40 +7920,30 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  HAS_INET_NTOP=yes
+  HAS_IPV6=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-HAS_INET_NTOP=no
+HAS_IPV6=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test $HAS_INET_NTOP = no ; then
+  if test $HAS_IPV6 = no ; then
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
   else
-    cat >>confdefs.h <<\_ACEOF
-#define P_HAS_INET_NTOP 1
-_ACEOF
-
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  fi
-else
-  echo "$as_me:$LINENO: checking for IPv6 support" >&5
-echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-                  #include <netinet/in.h>
+#include <sys/socket.h>
+                     #include <netdb.h>
 int
 main ()
 {
-struct sockaddr_in6 s; s.sin6_scope_id = 0;
+getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
   ;
   return 0;
 }
@@ -7988,22 +7978,39 @@
 HAS_IPV6=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test $HAS_IPV6 = no ; then
-    echo "$as_me:$LINENO: result: no" >&5
+    if test $HAS_IPV6 = no ; then
+      echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-  else
-    cat >conftest.$ac_ext <<_ACEOF
+    else
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define P_HAS_IPV6 1
+_ACEOF
+
+      HAS_IPV6=1
+    fi
+  fi
+fi
+
+
+HAS_INET_NTOP=
+echo "$as_me:$LINENO: checking for inet_ntop" >&5
+echo $ECHO_N "checking for inet_ntop... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/socket.h>
-                     #include <netdb.h>
+#include <sys/types.h>
+                #include <netinet/in.h>
+                #include <arpa/inet.h>
 int
 main ()
 {
-getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);
   ;
   return 0;
 }
@@ -8030,33 +8037,28 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  HAS_IPV6=yes
+  HAS_INET_NTOP=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-HAS_IPV6=no
+HAS_INET_NTOP=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $HAS_IPV6 = no ; then
-      echo "$as_me:$LINENO: result: no" >&5
+if test $HAS_INET_NTOP = no ; then
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-    else
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define P_HAS_IPV6 1
+else
+  cat >>confdefs.h <<\_ACEOF
+#define P_HAS_INET_NTOP 1
 _ACEOF
 
-      HAS_IPV6=1
-    fi
-  fi
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
 
 
 
-
 # Check whether --enable-qos or --disable-qos was given.
 if test "${enable_qos+set}" = set; then
   enableval="$enable_qos"
@@ -9164,6 +9166,37 @@
 
 
 
+if test "$HAS_VIDEO" \!= "1" ; then
+  default_appshare=no
+fi
+
+# Check whether --enable-vidfile or --disable-vidfile was given.
+if test "${enable_vidfile+set}" = set; then
+  enableval="$enable_vidfile"
+
+fi;
+
+if test "${enable_appshare}z" = "z" ; then
+  enable_vidfile=$default_appshare
+fi
+
+HAS_APPSHARE=
+if test "$enable_appshare" = "no" ; then
+  { echo "$as_me:$LINENO: Application share support disabled" >&5
+echo "$as_me: Application share support disabled" >&6;}
+else
+  { echo "$as_me:$LINENO: Application share enabled" >&5
+echo "$as_me: Application share enabled" >&6;}
+  HAS_APPSHARE=1
+  cat >>confdefs.h <<\_ACEOF
+#define P_APPSHARE 1
+_ACEOF
+
+fi
+
+
+
+
 # Check whether --enable-audio or --disable-audio was given.
 if test "${enable_audio+set}" = set; then
   enableval="$enable_audio"
@@ -10770,6 +10803,7 @@
 s,@HAS_CONFIG_FILE@... t
 s,@HAS_SOCKAGG@... t
 s,@HAS_VIDFILE@... t
+s,@HAS_APPSHARE@... t
 s,@HAS_AUDIO@... t
 s,@HAS_OSS@... t
 s,@HAS_ALSA@... t

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2007-11-05 12:22:36 UTC (rev 18814)
+++ ptlib/trunk/configure.ac	2007-11-05 12:23:10 UTC (rev 18815)
@@ -1582,21 +1582,9 @@
 fi
 
 HAS_IPV6=
-HAS_INET_NTOP=
 
 if test "$enable_ipv6" = "no" ; then
   AC_MSG_NOTICE(IPV6 disabled)
-  AC_MSG_CHECKING(for inet_ntop)
-  AC_TRY_COMPILE([#include <sys/types.h>
-                  #include <netinet/in.h>
-                  #include <arpa/inet.h>],
-                  [int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);], HAS_INET_NTOP=yes, HAS_INET_NTOP=no)
-  if test $HAS_INET_NTOP = no ; then
-    AC_MSG_RESULT(no)
-  else
-    AC_DEFINE(P_HAS_INET_NTOP, 1)
-    AC_MSG_RESULT(yes)
-  fi
 else
   AC_MSG_CHECKING(for IPv6 support)
   AC_TRY_COMPILE([#include <sys/types.h>
@@ -1619,6 +1607,19 @@
 fi
 AC_SUBST(HAS_IPV6)
 
+HAS_INET_NTOP=
+AC_MSG_CHECKING(for inet_ntop)
+AC_TRY_COMPILE([#include <sys/types.h>
+                #include <netinet/in.h>
+                #include <arpa/inet.h>],
+                [int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);], HAS_INET_NTOP=yes, HAS_INET_NTOP=no)
+if test $HAS_INET_NTOP = no ; then
+  AC_MSG_RESULT(no)
+else
+  AC_DEFINE(P_HAS_INET_NTOP, 1)
+  AC_MSG_RESULT(yes)
+fi
+
 dnl ########################################################################
 dnl look for QoS functions
 

Modified: ptlib/trunk/src/ptlib/common/sockets.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/sockets.cxx	2007-11-05 12:22:36 UTC (rev 18814)
+++ ptlib/trunk/src/ptlib/common/sockets.cxx	2007-11-05 12:23:10 UTC (rev 18815)
@@ -2528,8 +2528,8 @@
 #endif // P_HAS_IPV6
 # if defined(P_HAS_INET_NTOP)
   PString str;
-  if (inet_ntop(AF_INET, v.four, str.GetPointer(INET_ADDRSTRLEN), INET_ADDRSTRLEN) == NULL)
-    return PString::Empty()
+  if (inet_ntop(AF_INET, (const void *)&v.four, str.GetPointer(INET_ADDRSTRLEN), INET_ADDRSTRLEN) == NULL)
+    return PString::Empty();
   str.MakeMinimumSize();
   return str;
 # else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18821] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-07 05:51

Revision: 18821
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18821&view=rev
Author:   rjongbloed
Date:     2007-11-06 21:51:39 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
Added virtual functions on PProcess called whenever threads are started/ended.

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/pprocess.h
    ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx
    ptlib/trunk/src/ptlib/common/osutils.cxx
    ptlib/trunk/src/ptlib/msos/win32.cxx
    ptlib/trunk/src/ptlib/unix/tlibbe.cxx
    ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx
    ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
    ptlib/trunk/src/ptlib/unix/tlibvx.cxx

Modified: ptlib/trunk/include/ptlib/pprocess.h
===================================================================
--- ptlib/trunk/include/ptlib/pprocess.h	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/include/ptlib/pprocess.h	2007-11-07 05:51:39 UTC (rev 18821)
@@ -455,6 +455,20 @@
      */
     static PProcess & Current();
 
+    /**Callback for when a thread is started by the PTLib system. Note this is
+       called in the context of the new thread.
+      */
+    virtual void OnThreadStart(
+      PThread & thread
+    );
+
+    /**Callback for when a thread is ended if wqas started in the PTLib system.
+       Note this is called in the context of the old thread.
+      */
+    virtual void OnThreadEnded(
+      PThread & thread
+    );
+
     /**Determine if the current processes object instance has been initialised.
        If this returns TRUE it is safe to use the PProcess::Current() function.
        
@@ -548,6 +562,10 @@
      */
     DWORD GetProcessID() const;
 
+    /**Return the time at which the program was started 
+    */
+    PTime GetStartTime() const;
+
     /**Get the effective user name of the owner of the process, eg "root" etc.
        This is a platform dependent string only provided by platforms that are
        multi-user. Note that some value may be returned as a "simulated" user.
@@ -712,35 +730,31 @@
     static PDirectory GetOSConfigDir();
   //@}
 
-    PTimerList * GetTimerList();
-    /* Get the list of timers handled by the application. This is an internal
+    /**Get the list of timers handled by the application. This is an internal
        function and should not need to be called by the user.
        
        @return
        list of timers.
      */
+    PTimerList * GetTimerList();
 
+    /**Internal initialisation function called directly from
+       #_main()#. The user should never call this function.
+     */
     static void PreInitialise(
       int argc,     // Number of program arguments.
       char ** argv, // Array of strings for program arguments.
       char ** envp  // Array of string for the system environment
     );
-    /* Internal initialisation function called directly from
+
+    /**Internal shutdown function called directly from the ~PProcess
        #_main()#. The user should never call this function.
      */
-
     static void PreShutdown();
-    /* Internal shutdown function called directly from the ~PProcess
-       #_main()#. The user should never call this function.
-     */
 
+    /// Main function for process, called from real main after initialisation
     virtual int _main(void * arg = NULL);
-    // Main function for process, called from real main after initialisation
 
-    PTime GetStartTime() const;
-    /* return the time at which the program was started 
-    */
-
   private:
     void Construct();
 

Modified: ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx
===================================================================
--- ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -291,6 +291,9 @@
 }
 
 void pwNUTask::Entry()
-  {
+{
+  PProcess & process = PProcess::Current();
+  process.OnThreadStart(*AssociatedPThread);
   AssociatedPThread->Main();
-  }
+  process.OnThreadEnded(*AssociatedPThread);
+}

Modified: ptlib/trunk/src/ptlib/common/osutils.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/osutils.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/common/osutils.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -2239,6 +2239,16 @@
 }
 
 
+void PProcess::OnThreadStart(PThread & /*thread*/)
+{
+}
+
+
+void PProcess::OnThreadEnded(PThread & /*thread*/)
+{
+}
+
+
 BOOL PProcess::IsInitialised()
 {
   return PProcessInstance != NULL;

Modified: ptlib/trunk/src/ptlib/msos/win32.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/win32.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/msos/win32.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -1262,7 +1262,9 @@
   ::CoInitializeEx(NULL, COINIT_MULTITHREADED);
 #endif
 
+  process.OnThreadStart(*thread);
   thread->Main();
+  process.OnThreadEnded(*thread);
 
 #if defined(_WIN32_DCOM)
   ::CoUninitialize();

Modified: ptlib/trunk/src/ptlib/unix/tlibbe.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibbe.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibbe.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -152,8 +152,12 @@
   process.activeThreads.SetAt((unsigned) thread->mId, thread);
   process.threadMutex.Signal();
 
+  process.OnThreadStart(*thread);
+
   thread->Main();
 
+  process.OnThreadEnded(*thread);
+
   return 0;
 }
 

Modified: ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -429,10 +429,14 @@
     thread->suspend_semaphore->Wait();	// Wait for the Resume
   }
 
+  process.OnThreadStart(*thread);
+
   // now call the the thread main routine
   //PTRACE(1, "tlibthrd\tAbout to call Main");
   thread->Main();
 
+  process.OnThreadEnded(*thread);
+
 #ifdef DEBUG_THREADS
   if (debug_mpthreads)
       fprintf(stderr,"thread %p returning\n", thread);

Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -1357,6 +1357,8 @@
 
   PTRACE(5, "PWLib\tStarted thread " << thread << ' ' << thread->threadName);
 
+  PProcess::Current().OnThreadStart(*thread);
+
   // now call the the thread main routine
   thread->Main();
 
@@ -1369,10 +1371,11 @@
 
 void PThread::PX_ThreadEnd(void * arg)
 {
+  PThread * thread = (PThread *)arg;
   PProcess & process = PProcess::Current();
+  process.OnThreadEnded(*thread);
   process.threadMutex.Wait();
 
-  PThread * thread = (PThread *)arg;
   pthread_t id = thread->GetThreadId();
   if (id == 0) {
     // Don't know why, but pthreads under Linux at least can call this function

Modified: ptlib/trunk/src/ptlib/unix/tlibvx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibvx.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibvx.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -138,7 +138,9 @@
   if (::semTake(thread->syncPoint, WAIT_FOREVER) == OK) {
     if (::semDelete(thread->syncPoint) == OK)
       thread->syncPoint = NULL;
-  thread->Main();
+    process.OnThreadStart(*thread);
+    thread->Main();
+    process.OnThreadEnded(*thread);
   }
   else
     printf("::ThreadFunction> ::semTake failed, errno=0x%X\n",errno);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18828] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-10 02:07

Revision: 18828
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18828&view=rev
Author:   rjongbloed
Date:     2007-11-09 18:07:02 -0800 (Fri, 09 Nov 2007)

Log Message:
-----------
Fixed UNICODE support issue where wchar_t is not precisely the same thing as the WORD (aka unsigned short) type previously used in strings.

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/asner.h
    ptlib/trunk/include/ptlib/msos/ptlib_2005.dtf
    ptlib/trunk/include/ptlib/msos/ptlib_2005_wm.dtf
    ptlib/trunk/include/ptlib/msos/ptlib_2005_wm6.dtf
    ptlib/trunk/include/ptlib/msos/ptlibd_2005.dtf
    ptlib/trunk/include/ptlib/msos/ptlibd_2005_wm.dtf
    ptlib/trunk/include/ptlib/msos/ptlibd_2005_wm6.dtf
    ptlib/trunk/include/ptlib/msos/ptlibn_2005.dtf
    ptlib/trunk/include/ptlib/msos/ptlibn_2005_wm.dtf
    ptlib/trunk/include/ptlib/msos/ptlibn_2005_wm6.dtf
    ptlib/trunk/include/ptlib/pstring.h
    ptlib/trunk/samples/hello_world/helloDLL_2005.vcproj
    ptlib/trunk/samples/hello_world/hello_2005.vcproj
    ptlib/trunk/src/ptclib/asnber.cxx
    ptlib/trunk/src/ptclib/asner.cxx
    ptlib/trunk/src/ptlib/common/contain.cxx
    ptlib/trunk/src/ptlib/msos/Console_2005.vcproj
    ptlib/trunk/src/ptlib/msos/PTLib_2005.vcproj
    ptlib/trunk/src/ptlib/msos/win32.cxx
    ptlib/trunk/tools/asnparser/main.cxx

Modified: ptlib/trunk/include/ptclib/asner.h
===================================================================
--- ptlib/trunk/include/ptclib/asner.h	2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptclib/asner.h	2007-11-10 02:07:02 UTC (rev 18828)
@@ -740,7 +740,7 @@
     PCLASSINFO(PASN_BMPString, PASN_ConstrainedObject);
   public:
     PASN_BMPString(const char * str = NULL);
-    PASN_BMPString(const PWORDArray & wstr);
+    PASN_BMPString(const PWCharArray & wstr);
     PASN_BMPString(unsigned tag, TagClass tagClass);
 
     PASN_BMPString(const PASN_BMPString & other);
@@ -748,18 +748,18 @@
 
     PASN_BMPString & operator=(const char * v) { return operator=(PString(v).AsUCS2()); }
     PASN_BMPString & operator=(const PString & v) { return operator=(v.AsUCS2()); }
-    PASN_BMPString & operator=(const PWORDArray & v);
+    PASN_BMPString & operator=(const PWCharArray & v);
     operator PString() const { return GetValue(); }
-    operator PWORDArray() const { return value; }
+    operator PWCharArray() const { return value; }
     PString GetValue() const { return value; }
-    void GetValue(PWORDArray & v) const { v = value; }
+    void GetValue(PWCharArray & v) const { v = value; }
     void SetValue(const char * v) { operator=(PString(v).AsUCS2()); }
     void SetValue(const PString & v) { operator=(v.AsUCS2()); }
-    void SetValue(const PWORDArray & v) { operator=(v); }
+    void SetValue(const PWCharArray & v) { operator=(v); }
     void SetValue(const PASN_BMPString & v) { operator=(v.value); }
 
     void SetCharacterSet(ConstraintType ctype, const char * charSet);
-    void SetCharacterSet(ConstraintType ctype, const PWORDArray & charSet);
+    void SetCharacterSet(ConstraintType ctype, const PWCharArray & charSet);
     void SetCharacterSet(ConstraintType ctype, unsigned firstChar, unsigned lastChar);
 
     virtual Comparison Compare(const PObject & obj) const;
@@ -785,9 +785,9 @@
     void Construct();
     BOOL IsLegalCharacter(WORD ch);
 
-    PWORDArray value;
-    PWORDArray characterSet;
-    WORD firstChar, lastChar;
+    PWCharArray value;
+    PWCharArray characterSet;
+    wchar_t firstChar, lastChar;
     unsigned charSetUnalignedBits;
     unsigned charSetAlignedBits;
 };

Modified: ptlib/trunk/include/ptlib/msos/ptlib_2005.dtf
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib_2005.dtf	2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptlib/msos/ptlib_2005.dtf	2007-11-10 02:07:02 UTC (rev 18828)
@@ -632,7 +632,6 @@
     ??0?$PBaseArray@... @487 NONAME
     ??0?$PBaseArray@... @488 NONAME
     ??0?$PBaseArray@... @489 NONAME
-    ??0?$PBaseArray@... @490 NONAME
     ??0?$PBaseArray@... @491 NONAME
     ??0?$PBaseArray@... @492 NONAME
     ??0?$PBaseArray@... @493 NONAME
@@ -654,6 +653,9 @@
     ??0?$PBaseArray@... @17946 NONAME
     ??0?$PBaseArray@... @510 NONAME
     ??0?$PBaseArray@... @511 NONAME
+    ??0?$PBaseArray@... @18799 NONAME
+    ??0?$PBaseArray@... @18800 NONAME
+    ??0?$PBaseArray@... @18801 NONAME
     ??0?$PDevicePluginAdapter@... @512 NONAME
     ??0?$PDevicePluginAdapter@... @513 NONAME
     ??0?$PDevicePluginAdapter@... @514 NONAME
@@ -747,6 +749,8 @@
     ??0?$PList@... @597 NONAME
     ??0?$PList@... @598 NONAME
     ??0?$PList@... @599 NONAME
+    ??0?$PList@... @18802 NONAME
+    ??0?$PList@... @18803 NONAME
     ??0?$PList@... @600 NONAME
     ??0?$PList@... @601 NONAME
     ??0?$PList@... @602 NONAME
@@ -761,9 +765,7 @@
     ??0?$PQueue@... @610 NONAME
     ??0?$PSafePtr@... @17492 NONAME
     ??0?$PScalarArray@... @611 NONAME
-    ??0?$PScalarArray@... @612 NONAME
     ??0?$PScalarArray@... @613 NONAME
-    ??0?$PScalarArray@... @614 NONAME
     ??0?$PScalarArray@... @615 NONAME
     ??0?$PScalarArray@... @616 NONAME
     ??0?$PScalarArray@... @617 NONAME
@@ -1381,7 +1383,7 @@
     ??0PASN_BitString@... @1132 NONAME
     ??0PASN_BitString@... @1133 NONAME
     ??0PASN_BMPString@... @1134 NONAME
-    ??0PASN_BMPString@... @1135 NONAME
+    ??0PASN_BMPString@... @18804 NONAME
     ??0PASN_BMPString@... @1136 NONAME
     ??0PASN_BMPString@... @1137 NONAME
     ??0PASN_Boolean@... @1138 NONAME
@@ -1952,7 +1954,7 @@
     ??0PString@... @1628 NONAME
     ??0PString@... @1629 NONAME
     ??0PString@... @1630 NONAME
-    ??0PString@... @1631 NONAME
+    ??0PString@... @18805 NONAME
     ??0PString@... @1632 NONAME
     ??0PString@... @1633 NONAME
     ??0PString@... @1634 NONAME
@@ -1962,8 +1964,8 @@
     ??0PString@... @1638 NONAME
     ??0PString@... @1639 NONAME
     ??0PString@... @1640 NONAME
-    ??0PString@... @1641 NONAME
-    ??0PString@... @1642 NONAME
+    ??0PString@... @18806 NONAME
+    ??0PString@... @18807 NONAME
     ??0PString@... @1643 NONAME
     ??0PString@... @1644 NONAME
     ??0PString@... @1645 NONAME
@@ -2442,6 +2444,7 @@
     ??1?$PBaseArray@... @2090 NONAME
     ??1?$PBaseArray@... @18069 NONAME
     ??1?$PBaseArray@... @2092 NONAME
+    ??1?$PBaseArray@... @18808 NONAME
     ??1?$PDevicePluginAdapter@... @2093 NONAME
     ??1?$PDevicePluginAdapter@... @2094 NONAME
     ??1?$PDevicePluginAdapter@... @2095 NONAME
@@ -2495,6 +2498,7 @@
     ??1?$PList@... @2139 NONAME
     ??1?$PList@... @2140 NONAME
     ??1?$PList@... @2141 NONAME
+    ??1?$PList@... @18809 NONAME
     ??1?$PList@... @2142 NONAME
     ??1?$PList@... @2143 NONAME
     ??1?$PNatMethodServiceDescriptor@... @16855 NONAME
@@ -3320,6 +3324,7 @@
     ??4?$PBaseArray@... @2891 NONAME
     ??4?$PBaseArray@... @2892 NONAME
     ??4?$PBaseArray@... @2893 NONAME
+    ??4?$PBaseArray@... @18810 NONAME
     ??4?$PList@... @2894 NONAME
     ??4?$PList@... @17535 NONAME
     ??4?$PList@... @2895 NONAME
@@ -3360,7 +3365,7 @@
     ??4PASN_Array@... @2929 NONAME
     ??4PASN_BitString@... @2930 NONAME
     ??4PASN_BMPString@... @2931 NONAME
-    ??4PASN_BMPString@... @2932 NONAME
+    ??4PASN_BMPString@... @18811 NONAME
     ??4PASN_Boolean@... @2933 NONAME
     ??4PASN_Choice@... @2934 NONAME
     ??4PASN_ConstrainedObject@... @2935 NONAME
@@ -3620,7 +3625,6 @@
     ??A?$PBaseArray@... @3151 NONAME
     ??A?$PBaseArray@... @3152 NONAME
     ??A?$PBaseArray@... @3153 NONAME
-    ??A?$PBaseArray@... @3154 NONAME
     ??A?$PBaseArray@... @3155 NONAME
     ??A?$PBaseArray@... @3156 NONAME
     ??A?$PBaseArray@... @3157 NONAME
@@ -3633,6 +3637,8 @@
     ??A?$PBaseArray@... @18134 NONAME
     ??A?$PBaseArray@... @18135 NONAME
     ??A?$PBaseArray@... @3166 NONAME
+    ??A?$PBaseArray@... @18812 NONAME
+    ??A?$PBaseArray@... @18813 NONAME
     ??A?$PDictionary@... @3167 NONAME
     ??A?$PDictionary@... @3168 NONAME
     ??A?$PList@... @3169 NONAME
@@ -3698,6 +3704,7 @@
     ??B?$PBaseArray@... @3228 NONAME
     ??B?$PBaseArray@... @18137 NONAME
     ??B?$PBaseArray@... @3230 NONAME
+    ??B?$PBaseArray@... @18814 NONAME
     ??B?$PSafePtr@... @17542 NONAME
     ??BAddress@... @3231 NONAME
     ??BAddress@... @3232 NONAME
@@ -4172,6 +4179,7 @@
     ??_7?$PBaseArray@...@ @3602 NONAME
     ??_7?$PBaseArray@...@ @18199 NONAME
     ??_7?$PBaseArray@...@ @3604 NONAME
+    ??_7?$PBaseArray@...@ @18815 NONAME
     ??_7?$PDevicePluginAdapter@...@ @3605 NONAME
     ??_7?$PDevicePluginAdapter@...@ @3606 NONAME
     ??_7?$PDevicePluginAdapter@...@ @3607 NONAME
@@ -4225,6 +4233,7 @@
     ??_7?$PList@...@ @3651 NONAME
     ??_7?$PList@...@ @3652 NONAME
     ??_7?$PList@...@ @3653 NONAME
+    ??_7?$PList@...@ @18816 NONAME
     ??_7?$PList@...@ @3654 NONAME
     ??_7?$PList@...@ @3655 NONAME
     ??_7?$PNatMethodServiceDescriptor@...@ @16898 NONAME
@@ -5296,6 +5305,7 @@
     ??_R0?AV?$PBaseArray@... @4657 NONAME
     ??_R0?AV?$PBaseArray@... @18234 NONAME
     ??_R0?AV?$PBaseArray@... @4659 NONAME
+    ??_R0?AV?$PBaseArray@... @18817 NONAME
     ??_R0?AV?$PDevicePluginAdapter@... @4660 NONAME
     ??_R0?AV?$PDevicePluginAdapter@... @4661 NONAME
     ??_R0?AV?$PDevicePluginAdapter@... @4662 NONAME
@@ -5349,6 +5359,7 @@
     ??_R0?AV?$PList@... @4706 NONAME
     ??_R0?AV?$PList@... @4707 NONAME
     ??_R0?AV?$PList@... @4708 NONAME
+    ??_R0?AV?$PList@... @18818 NONAME
     ??_R0?AV?$PList@... @4709 NONAME
     ??_R0?AV?$PList@... @4710 NONAME
     ??_R0?AV?$PNatMethodServiceDescriptor@... @16907 NONAME
@@ -6091,6 +6102,7 @@
     ??_R1A@... @5396 NONAME
     ??_R1A@... @18263 NONAME
     ??_R1A@... @5398 NONAME
+    ??_R1A@... @18819 NONAME
     ??_R1A@... @5399 NONAME
     ??_R1A@... @5400 NONAME
     ??_R1A@... @5401 NONAME
@@ -6144,6 +6156,7 @@
     ??_R1A@... @5445 NONAME
     ??_R1A@... @5446 NONAME
     ??_R1A@... @5447 NONAME
+    ??_R1A@... @18820 NONAME
     ??_R1A@... @5448 NONAME
     ??_R1A@... @5449 NONAME
     ??_R1A@... @16915 NONAME
@@ -6941,6 +6954,7 @@
     ??_R2?$PBaseArray@... @6186 NONAME
     ??_R2?$PBaseArray@... @18295 NONAME
     ??_R2?$PBaseArray@... @6188 NONAME
+    ??_R2?$PBaseArray@... @18821 NONAME
     ??_R2?$PDevicePluginAdapter@... @6189 NONAME
     ??_R2?$PDevicePluginAdapter@... @6190 NONAME
     ??_R2?$PDevicePluginAdapter@... @6191 NONAME
@@ -6994,6 +7008,7 @@
     ??_R2?$PList@... @6235 NONAME
     ??_R2?$PList@... @6236 NONAME
     ??_R2?$PList@... @6237 NONAME
+    ??_R2?$PList@... @18822 NONAME
     ??_R2?$PList@... @6238 NONAME
     ??_R2?$PList@... @6239 NONAME
     ??_R2?$PNatMethodServiceDescriptor@... @16924 NONAME
@@ -7754,6 +7769,7 @@
     ??_R3?$PBaseArray@... @6943 NONAME
     ??_R3?$PBaseArray@... @18324 NONAME
     ??_R3?$PBaseArray@... @6945 NONAME
+    ??_R3?$PBaseArray@... @18823 NONAME
     ??_R3?$PDevicePluginAdapter@... @6946 NONAME
     ??_R3?$PDevicePluginAdapter@... @6947 NONAME
     ??_R3?$PDevicePluginAdapter@... @6948 NONAME
@@ -7807,6 +7823,7 @@
     ??_R3?$PList@... @6992 NONAME
     ??_R3?$PList@... @6993 NONAME
     ??_R3?$PList@... @6994 NONAME
+    ??_R3?$PList@... @18824 NONAME
     ??_R3?$PList@... @6995 NONAME
     ??_R3?$PList@... @6996 NONAME
     ??_R3?$PNatMethodServiceDescriptor@... @16932 NONAME
@@ -8562,6 +8579,7 @@
     ??_R4?$PBaseArray@...@ @7695 NONAME
     ??_R4?$PBaseArray@...@ @18353 NONAME
     ??_R4?$PBaseArray@...@ @7697 NONAME
+    ??_R4?$PBaseArray@...@ @18825 NONAME
     ??_R4?$PDevicePluginAdapter@...@ @7698 NONAME
     ??_R4?$PDevicePluginAdapter@...@ @7699 NONAME
     ??_R4?$PDevicePluginAdapter@...@ @7700 NONAME
@@ -8615,6 +8633,7 @@
     ??_R4?$PList@...@ @7744 NONAME
     ??_R4?$PList@...@ @7745 NONAME
     ??_R4?$PList@...@ @7746 NONAME
+    ??_R4?$PList@...@ @18826 NONAME
     ??_R4?$PList@...@ @7747 NONAME
     ??_R4?$PList@...@ @7748 NONAME
     ??_R4?$PNatMethodServiceDescriptor@...@ @16940 NONAME
@@ -9657,7 +9676,7 @@
     ?AsString@... @8709 NONAME
     ?AsString@... @8710 NONAME
     ?AssureConnect@... @8711 NONAME
-    ?AsUCS2@... @8712 NONAME
+    ?AsUCS2@... @18827 NONAME
     ?AsUnsigned64@... @8713 NONAME
     ?AsUnsigned@... @8714 NONAME
     ?AsXML@... @8715 NONAME
@@ -9871,6 +9890,7 @@
     ?Class@... @8907 NONAME
     ?Class@... @18401 NONAME
     ?Class@... @8909 NONAME
+    ?Class@... @18828 NONAME
     ?Class@... @8910 NONAME
     ?Class@... @8911 NONAME
     ?Class@... @8912 NONAME
@@ -9904,6 +9924,7 @@
     ?Class@... @8940 NONAME
     ?Class@... @8941 NONAME
     ?Class@... @8942 NONAME
+    ?Class@... @18829 NONAME
     ?Class@... @8943 NONAME
     ?Class@... @8944 NONAME
     ?Class@... @8945 NONAME
@@ -10336,6 +10357,7 @@
     ?Clone@... @9328 NONAME
     ?Clone@... @18430 NONAME
     ?Clone@... @9330 NONAME
+    ?Clone@... @18830 NONAME
     ?Clone@... @9331 NONAME
     ?Clone@... @9332 NONAME
     ?Clone@... @9333 NONAME
@@ -10369,6 +10391,7 @@
     ?Clone@... @9361 NONAME
     ?Clone@... @9362 NONAME
     ?Clone@... @9363 NONAME
+    ?Clone@... @18831 NONAME
     ?Clone@... @9364 NONAME
     ?Clone@... @9365 NONAME
     ?Clone@... @9366 NONAME
@@ -10619,6 +10642,7 @@
     ?CompareObjectMemoryDirect@... @9576 NONAME
     ?CompareObjectMemoryDirect@... @18457 NONAME
     ?CompareObjectMemoryDirect@... @9578 NONAME
+    ?CompareObjectMemoryDirect@... @18832 NONAME
     ?CompareObjectMemoryDirect@... @9579 NONAME
     ?CompareObjectMemoryDirect@... @9580 NONAME
     ?CompareObjectMemoryDirect@... @9581 NONAME
@@ -10652,6 +10676,7 @@
     ?CompareObjectMemoryDirect@... @9609 NONAME
     ?CompareObjectMemoryDirect@... @9610 NONAME
     ?CompareObjectMemoryDirect@... @9611 NONAME
+    ?CompareObjectMemoryDirect@... @18833 NONAME
     ?CompareObjectMemoryDirect@... @9612 NONAME
     ?CompareObjectMemoryDirect@... @9613 NONAME
     ?CompareObjectMemoryDirect@... @9614 NONAME
@@ -12089,6 +12114,7 @@
     ?GetAt@... @10873 NONAME
     ?GetAt@... @18547 NONAME
     ?GetAt@... @10875 NONAME
+    ?GetAt@... @18834 NONAME
     ?GetAt@... @10876 NONAME
     ?GetAt@... @10877 NONAME
     ?GetAt@... @10878 NONAME
@@ -12171,6 +12197,7 @@
     ?GetClass@... @10946 NONAME
     ?GetClass@... @18552 NONAME
     ?GetClass@... @10948 NONAME
+    ?GetClass@... @18835 NONAME
     ?GetClass@... @10949 NONAME
     ?GetClass@... @10950 NONAME
     ?GetClass@... @10951 NONAME
@@ -12204,6 +12231,7 @@
     ?GetClass@... @10979 NONAME
     ?GetClass@... @10980 NONAME
     ?GetClass@... @10981 NONAME
+    ?GetClass@... @18836 NONAME
     ?GetClass@... @10982 NONAME
     ?GetClass@... @10983 NONAME
     ?GetClass@... @10984 NONAME
@@ -12655,6 +12683,13 @@
     ?GetDescription@... @11390 NONAME
     ?GetDescription@... @11391 NONAME
     ?GetDescription@... @11392 NONAME
+    ?GetDeviceCapabilities@... @18837 NONAME
+    ?GetDeviceCapabilities@... @18838 NONAME
+    ?GetDeviceCapabilities@... @18839 NONAME
+    ?GetDeviceCapabilities@... @18840 NONAME
+    ?GetDeviceCapabilities@... @18841 NONAME
+    ?GetDeviceCapabilities@... @18842 NONAME
+    ?GetDeviceCapabilities@... @18843 NONAME
     ?GetDeviceID@... @17819 NONAME
     ?GetDeviceID@... @11393 NONAME
     ?GetDeviceNames@... @16994 NONAME
@@ -12899,6 +12934,7 @@
     ?GetInteger@... @11618 NONAME
     ?GetInterface@... @11619 NONAME
     ?GetInterface@... @17685 NONAME
+    ?GetInterface@... @18844 NONAME
     ?GetInterfaceAddress@... @11620 NONAME
     ?GetInterfaceInfo@... @17686 NONAME
     ?GetInterfaceInfo@... @17687 NONAME
@@ -13047,6 +13083,8 @@
     ?GetNatTypeString@... @11749 NONAME
     ?GetNest@... @11750 NONAME
     ?GetNetMask@... @11751 NONAME
+    ?GetNetMask@... @18845 NONAME
+    ?GetNetwork@... @18846 NONAME
     ?GetNetworkInterface@... @11752 NONAME
     ?GetNext@... @11753 NONAME
     ?GetNext@... @11754 NONAME
@@ -13160,6 +13198,7 @@
     ?GetPluginDirs@... @11861 NONAME
     ?GetPluginList@... @11862 NONAME
     ?GetPluginManager@... @11863 NONAME
+    ?GetPluginsDeviceCapabilities@... @18847 NONAME
     ?GetPluginsDeviceNames@... @11864 NONAME
     ?GetPluginsProviding@... @11865 NONAME
     ?GetPluginTypes@... @11866 NONAME
@@ -13173,6 +13212,7 @@
     ?GetPointer@... @11874 NONAME
     ?GetPointer@... @11875 NONAME
     ?GetPointer@... @11876 NONAME
+    ?GetPointer@... @18848 NONAME
     ?GetPointer@... @11877 NONAME
     ?GetPointer@... @11878 NONAME
     ?GetPointer@... @11879 NONAME
@@ -13251,6 +13291,7 @@
     ?GetRoot@... @11947 NONAME
     ?GetRootElement@... @11948 NONAME
     ?GetRouteAddress@... @11949 NONAME
+    ?GetRouteInterfaceAddress@... @18849 NONAME
     ?GetRouteTable@... @11950 NONAME
     ?GetSampleRate@... @11951 NONAME
     ?GetSampleRate@... @11952 NONAME
@@ -13669,7 +13710,7 @@
     ?InternalCompleteDigest@... @12330 NONAME
     ?InternalCompleteDigest@... @12331 NONAME
     ?InternalEndRead@... @12332 NONAME
-    ?InternalFromUCS2@... @12333 NONAME
+    ?InternalFromUCS2@... @18850 NONAME
     ?InternalGetData@... @12334 NONAME
     ?InternalIsDescendant@... @12335 NONAME
     ?InternalIsDescendant@... @12336 NONAME
@@ -13692,6 +13733,7 @@
     ?InternalIsDescendant@... @12353 NONAME
     ?InternalIsDescendant@... @18604 NONAME
     ?InternalIsDescendant@... @12355 NONAME
+    ?InternalIsDescendant@... @18851 NONAME
     ?InternalIsDescendant@... @12356 NONAME
     ?InternalIsDescendant@... @12357 NONAME
     ?InternalIsDescendant@... @12358 NONAME
@@ -13725,6 +13767,7 @@
     ?InternalIsDescendant@... @12386 NONAME
     ?InternalIsDescendant@... @12387 NONAME
     ?InternalIsDescendant@... @12388 NONAME
+    ?InternalIsDescendant@... @18852 NONAME
     ?InternalIsDescendant@... @12389 NONAME
     ?InternalIsDescendant@... @12390 NONAME
     ?InternalIsDescendant@... @12391 NONAME
@@ -14748,6 +14791,8 @@
     ?OnSyntaxError@... @13323 NONAME
     ?OnSYST@... @13324 NONAME
     ?OnTextData@... @13325 NONAME
+    ?OnThreadEnded@... @18853 NONAME
+    ?OnThreadStart@... @18854 NONAME
     ?OnTimeout@... @13326 NONAME
     ?OnTOP@... @13327 NONAME
     ?OnTURN@... @13329 NONAME
@@ -15045,6 +15090,7 @@
     ?PrintElementOn@... @13604 NONAME
     ?PrintElementOn@... @18659 NONAME
     ?PrintElementOn@... @13606 NONAME
+    ?PrintElementOn@... @18855 NONAME
     ?PrintElementOn@... @13607 NONAME
     ?PrintOn@... @13608 NONAME
     ?PrintOn@... @13609 NONAME
@@ -15686,7 +15732,7 @@
     ?SetChannel@... @14205 NONAME
     ?SetChannel@... @14206 NONAME
     ?SetChannels@... @14207 NONAME
-    ?SetCharacterSet@... @14208 NONAME
+    ?SetCharacterSet@... @18856 NONAME
     ?SetCharacterSet@... @14209 NONAME
     ?SetCharacterSet@... @14210 NONAME
     ?SetCharacterSet@... @14211 NONAME
@@ -15991,7 +16037,7 @@
     ?SetUserName@... @14495 NONAME
     ?SetValue@... @14496 NONAME
     ?SetValue@... @14497 NONAME
-    ?SetValue@... @14498 NONAME
+    ?SetValue@... @18857 NONAME
     ?SetValue@... @14499 NONAME
     ?SetValue@... @14500 NONAME
     ?SetValue@... @14501 NONAME

Modified: ptlib/trunk/include/ptlib/msos/ptlib_2005_wm.dtf
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib_2005_wm.dtf	2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptlib/msos/ptlib_2005_wm.dtf	2007-11-10 02:07:02 UTC (rev 18828)
@@ -620,14 +620,14 @@
     ??0?$PList@... @17720 NONAME
     ??0?$PList@... @17721 NONAME
     ??0?$PList@... @17722 NONAME
+    ??0?$PList@... @25647 NONAME
+    ??0?$PList@... @25648 NONAME
     ??0?$PNatMethodServiceDescriptor@... @17723 NONAME
     ??0?$POrdinalDictionary@... @17724 NONAME
     ??0?$POrdinalDictionary@... @17725 NONAME
     ??0?$PSafePtr@... @17726 NONAME
     ??0?$PScalarArray@... @17727 NONAME
-    ??0?$PScalarArray@... @17728 NONAME
     ??0?$PScalarArray@... @17729 NONAME
-    ??0?$PScalarArray@... @17730 NONAME
     ??0?$PScalarArray@... @17731 NONAME
     ??0?$PScalarArray@... @17732 NONAME
     ??0?$PScalarArray@... @17733 NONAME
@@ -1116,7 +1116,7 @@
     ??0PASN_BitString@... @18216 NONAME
     ??0PASN_BitString@... @18217 NONAME
     ??0PASN_BMPString@... @18218 NONAME
-    ??0PASN_BMPString@... @18219 NONAME
+    ??0PASN_BMPString@... @25649 NONAME
     ??0PASN_BMPString@... @18220 NONAME
     ??0PASN_BMPString@... @18221 NONAME
     ??0PASN_Boolean@... @18222 NONAME
@@ -1531,7 +1531,7 @@
     ??0PString@... @18631 NONAME
     ??0PString@... @18632 NONAME
     ??0PString@... @18633 NONAME
-    ??0PString@... @18634 NONAME
+    ??0PString@... @25650 NONAME
     ??0PString@... @18635 NONAME
     ??0PString@... @18636 NONAME
     ??0PString@... @18637 NONAME
@@ -1956,6 +1956,7 @@
     ??1?$PList@... @19055 NONAME
     ??1?$PList@... @19056 NONAME
     ??1?$PList@... @19057 NONAME
+    ??1?$PList@... @25651 NONAME
     ??1?$PNatMethodServiceDescriptor@... @19058 NONAME
     ??1?$POrdinalDictionary@... @19059 NONAME
     ??1?$PSafePtr@... @19060 NONAME
@@ -2572,7 +2573,7 @@
     ??4PASN_Array@... @19669 NONAME
     ??4PASN_BitString@... @19670 NONAME
     ??4PASN_BMPString@... @19671 NONAME
-    ??4PASN_BMPString@... @19672 NONAME
+    ??4PASN_BMPString@... @25652 NONAME
     ??4PASN_Boolean@... @19673 NONAME
     ??4PASN_Choice@... @19674 NONAME
     ??4PASN_ConstrainedObject@... @19675 NONAME
@@ -3335,6 +3336,7 @@
     ??_7?$PList@...@ @3650 NONAME
     ??_7?$PList@...@ @3651 NONAME
     ??_7?$PList@...@ @3652 NONAME
+    ??_7?$PList@...@ @25653 NONAME
     ??_7?$PNatMethodServiceDescriptor@...@ @16898 NONAME
     ??_7?$POrdinalDictionary@...@ @3656 NONAME
     ??_7?$PSafePtr@...@ @20369 NONAME
@@ -4121,6 +4123,7 @@
     ??_R0?AV?$PList@... @4705 NONAME
     ??_R0?AV?$PList@... @4706 NONAME
     ??_R0?AV?$PList@... @4707 NONAME
+    ??_R0?AV?$PList@... @25654 NONAME
     ??_R0?AV?$PNatMethodServiceDescriptor@... @16907 NONAME
     ??_R0?AV?$POrdinalDictionary@... @4711 NONAME
     ??_R0?AV?$PSafePtr@... @20486 NONAME
@@ -4700,6 +4703,7 @@
     ??_R1A@... @5444 NONAME
     ??_R1A@... @5445 NONAME
     ??_R1A@... @5446 NONAME
+    ??_R1A@... @25655 NONAME
     ??_R1A@... @16915 NONAME
     ??_R1A@... @5450 NONAME
     ??_R1A@... @20527 NONAME
@@ -5303,6 +5307,7 @@
     ??_R2?$PList@... @6234 NONAME
     ??_R2?$PList@... @6235 NONAME
     ??_R2?$PList@... @6236 NONAME
+    ??_R2?$PList@... @25656 NONAME
     ??_R2?$PNatMethodServiceDescriptor@... @16924 NONAME
     ??_R2?$POrdinalDictionary@... @6240 NONAME
     ??_R2?$PSafePtr@... @20572 NONAME
@@ -5872,6 +5877,7 @@
     ??_R3?$PList@... @6991 NONAME
     ??_R3?$PList@... @6992 NONAME
     ??_R3?$PList@... @6993 NONAME
+    ??_R3?$PList@... @25657 NONAME
     ??_R3?$PNatMethodServiceDescriptor@... @16932 NONAME
     ??_R3?$POrdinalDictionary@... @6997 NONAME
     ??_R3?$PSafePtr@... @20613 NONAME
@@ -6441,6 +6447,7 @@
     ??_R4?$PList@...@ @7743 NONAME
     ??_R4?$PList@...@ @7744 NONAME
     ??_R4?$PList@...@ @7745 NONAME
+    ??_R4?$PList@...@ @25658 NONAME
     ??_R4?$PNatMethodServiceDescriptor@...@ @16940 NONAME
     ??_R4?$POrdinalDictionary@...@ @7749 NONAME
     ??_R4?$PSafePtr@...@ @20659 NONAME
@@ -7182,7 +7189,7 @@
     ?AsString@... @20872 NONAME
     ?AsString@... @20873 NONAME
     ?AssureConnect@... @20874 NONAME
-    ?AsUCS2@... @20875 NONAME
+    ?AsUCS2@... @25659 NONAME
     ?AsUnsigned64@... @20876 NONAME
     ?AsUnsigned@... @20877 NONAME
     ?ate@... @8721 NONAME
@@ -7356,6 +7363,7 @@
     ?Class@... @8939 NONAME
     ?Class@... @8940 NONAME
     ?Class@... @8941 NONAME
+    ?Class@... @25660 NONAME
     ?Class@... @8945 NONAME
     ?Class@... @20997 NONAME
     ?Class@... @8948 NONAME
@@ -7682,6 +7690,7 @@
     ?Clone@... @21086 NONAME
     ?Clone@... @21087 NONAME
     ?Clone@... @21088 NONAME
+    ?Clone@... @25661 NONAME
     ?Clone@... @21089 NONAME
     ?Clone@... @21090 NONAME
     ?Clone@... @21091 NONAME
@@ -7897,6 +7906,7 @@
     ?CompareObjectMemoryDirect@... @21301 NONAME
     ?CompareObjectMemoryDirect@... @21302 NONAME
     ?CompareObjectMemoryDirect@... @21303 NONAME
+    ?CompareObjectMemoryDirect@... @25662 NONAME
     ?CompareObjectMemoryDirect@... @21304 NONAME
     ?CompareObjectMemoryDirect@... @21305 NONAME
     ?CompareObjectMemoryDirect@... @21306 NONAME
@@ -9091,6 +9101,7 @@
     ?GetClass@... @22385 NONAME
     ?GetClass@... @22386 NONAME
     ?GetClass@... @22387 NONAME
+    ?GetClass@... @25663 NONAME
     ?GetClass@... @22388 NONAME
     ?GetClass@... @22389 NONAME
     ?GetClass@... @22390 NONAME
@@ -9408,6 +9419,13 @@
     ?GetDescription@... @22691 NONAME
     ?GetDescription@... @22692 NONAME
     ?GetDescription@... @22693 NONAME
+    ?GetDeviceCapabilities@... @25664 NONAME
+    ?GetDeviceCapabilities@... @25665 NONAME
+    ?GetDeviceCapabilities@... @25666 NONAME
+    ?GetDeviceCapabilities@... @25667 NONAME
+    ?GetDeviceCapabilities@... @25668 NONAME
+    ?GetDeviceCapabilities@... @25669 NONAME
+    ?GetDeviceCapabilities@... @25670 NONAME
     ?GetDeviceID@... @22694 NONAME
     ?GetDeviceNames@... @22695 NONAME
     ?GetDeviceNames@... @22696 NONAME
@@ -9604,6 +9622,7 @@
     ?GetInteger@... @22844 NONAME
     ?GetInterface@... @11619 NONAME
     ?GetInterface@... @22845 NONAME
+    ?GetInterface@... @25671 NONAME
     ?GetInterfaceAddress@... @22846 NONAME
     ?GetInterfaceInfo@... @22847 NONAME
     ?GetInterfaceInfo@... @22848 NONAME
@@ -9726,6 +9745,8 @@
     ?GetNatTypeString@... @11749 NONAME
     ?GetNest@... @22948 NONAME
     ?GetNetMask@... @22949 NONAME
+    ?GetNetMask@... @25672 NONAME
+    ?GetNetwork@... @25673 NONAME
     ?GetNetworkInterface@... @11752 NONAME
     ?GetNext@... @22950 NONAME
     ?GetNext@... @22951 NONAME
@@ -9801,6 +9822,7 @@
     ?GetPluginDirs@... @11861 NONAME
     ?GetPluginList@... @23011 NONAME
     ?GetPluginManager@... @11863 NONAME
+    ?GetPluginsDeviceCapabilities@... @25674 NONAME
     ?GetPluginsDeviceNames@... @23012 NONAME
     ?GetPluginsProviding@... @23013 NONAME
     ?GetPluginTypes@... @23014 NONAME
@@ -9870,6 +9892,7 @@
     ?GetReturnCode@... @23074 NONAME
     ?GetRoot@... @23075 NONAME
     ?GetRouteAddress@... @11949 NONAME
+    ?GetRouteInterfaceAddress@... @25675 NONAME
     ?GetRouteTable@... @11950 NONAME
     ?GetSampleRate@... @23076 NONAME
     ?GetSampleRate@... @23077 NONAME
@@ -10223,6 +10246,7 @@
     ?InternalIsDescendant@... @23404 NONAME
     ?InternalIsDescendant@... @23405 NONAME
     ?InternalIsDescendant@... @23406 NONAME
+    ?InternalIsDescendant@... @25676 NONAME
     ?InternalIsDescendant@... @23407 NONAME
     ?InternalIsDescendant@... @23408 NONAME
     ?InternalIsDescendant@... @23409 NONAME
@@ -10936,6 +10960,8 @@
     ?OnSyntaxError@... @24091 NONAME
     ?OnSYST@... @24092 NONAME
     ?OnTextData@... @24093 NONAME
+    ?OnThreadEnded@... @25677 NONAME
+    ?OnThreadStart@... @25678 NONAME
     ?OnTimeout@... @24094 NONAME
     ?OnTOP@... @24095 NONAME
     ?OnTURN@... @24096 NONAME
@@ -11583,7 +11609,7 @@
     ?SetChannel@... @24648 NONAME
     ?SetChannel@... @24649 NONAME
     ?SetChannels@... @24650 NONAME
-    ?SetCharacterSet@... @24651 NONAME
+    ?SetCharacterSet@... @25679 NONAME
     ?SetCharacterSet@... @24652 NONAME
     ?SetCharacterSet@... @24653 NONAME
     ?SetCharacterSet@... @24654 NONAME
@@ -11797,7 +11823,7 @@
     ?SetURLSpace@... @24851 NONAME
     ?SetUserName@... @24852 NONAME
     ?SetUserName@... @24853 NONAME
-    ?SetValue@... @24854 NONAME
+    ?SetValue@... @25680 NONAME
     ?SetValue@... @24855 NONAME
     ?SetValue@... @24856 NONAME
     ?SetValue@... @24857 NONAME

Modified: ptlib/trunk/include/ptlib/msos/ptlib_2005_wm6.dtf
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib_2005_wm6.dtf	2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptlib/msos/ptlib_2005_wm6.dtf	2007-11-10 02:07:02 UTC (rev 18828)
@@ -620,14 +620,14 @@
     ??0?$PList@... @17720 NONAME
     ??0?$PList@... @17721 NONAME
     ??0?$PList@... @17722 NONAME
+    ??0?$PList@... @25645 NONAME
+    ??0?$PList@... @25646 NONAME
     ??0?$PNatMethodServiceDescriptor@... @17723 NONAME
     ??0?$POrdinalDictionary@... @17724 NONAME
     ??0?$POrdinalDictionary@... @17725 NONAME
     ??0?$PSafePtr@... @17726 NONAME
     ??0?$PScalarArray@... @17727 NONAME
-    ??0?$PScalarArray@... @17728 NONAME
     ??0?$PScalarArray@... @17729 NONAME
-    ??0?$PScalarArray@... @17730 NONAME
     ??0?$PScalarArray@... @17731 NONAME
     ??0?$PScalarArray@... @17732 NONAME
     ??0?$PScalarArray@... @17733 NONAME
@@ -1116,7 +1116,7 @@
     ??0PASN_BitString@... @18216 NONAME
     ??0PASN_BitString@... @18217 NONAME
     ??0PASN_BMPString@... @18218 NONAME
-    ??0PASN_BMPString@... @18219 NONAME
+    ??0PASN_BMPString@... @25647 NONAME
     ??0PASN_BMPString@... @18220 NONAME
     ??0PASN_BMPString@... @18221 NONAME
     ??0PASN_Boolean@... @18222 NONAME
@@ -1531,7 +1531,7 @@
     ??0PString@... @18631 NONAME
     ??0PString@... @18632 NONAME
     ??0PString@... @18633 NONAME
-    ??0PString@... @18634 NONAME
+    ??0PString@... @25648 NONAME
     ??0PString@... @18635 NONAME
     ??0PString@... @18636 NONAME
     ??0PString@... @18637 NONAME
@@ -1956,6 +1956,7 @@
     ??1?$PList@... @19055 NONAME
     ??1?$PList@... @19056 NONAME
     ??1?$PList@... @19057 NONAME
+    ??1?$PList@... @25649 NONAME
     ??1?$PNatMethodServiceDescriptor@... @19058 NONAME
     ??1?$POrdinalDictionary@... @19059 NONAME
     ??1?$PSafePtr@... @19060 NONAME
@@ -2572,7 +2573,7 @@
     ??4PASN_Array@... @19669 NONAME
     ??4PASN_BitString@... @19670 NONAME
     ??4PASN_BMPString@... @19671 NONAME
-    ??4PASN_BMPString@... @19672 NONAME
+    ??4PASN_BMPString@... @25650 NONAME
     ??4PASN_Boolean@... @19673 NONAME
     ??4PASN_Choice@... @19674 NONAME
     ??4PASN_ConstrainedObject@... @19675 NONAME
@@ -3335,6 +3336,7 @@
     ??_7?$PList@...@ @3650 NONAME
     ??_7?$PList@...@ @3651 NONAME
     ??_7?$PList@...@ @3652 NONAME
+    ??_7?$PList@...@ @25651 NONAME
     ??_7?$PNatMethodServiceDescriptor@...@ @16898 NONAME
     ??_7?$POrdinalDictionary@...@ @3656 NONAME
     ??_7?$PSafePtr@...@ @20369 NONAME
@@ -4121,6 +4123,7 @@
     ??_R0?AV?$PList@... @4705 NONAME
     ??_R0?AV?$PList@... @4706 NONAME
     ??_R0?AV?$PList@... @4707 NONAME
+    ??_R0?AV?$PList@... @25652 NONAME
     ??_R0?AV?$PNatMethodServiceDescriptor@... @16907 NONAME
     ??_R0?AV?$POrdinalDictionary@... @4711 NONAME
     ??_R0?AV?$PSafePtr@... @20486 NONAME
@@ -4700,6 +4703,7 @@
     ??_R1A@... @5444 NONAME
     ??_R1A@... @5445 NONAME
     ??_R1A@... @5446 NONAME
+    ??_R1A@... @25653 NONAME
     ??_R1A@... @16915 NONAME
     ??_R1A@... @5450 NONAME
     ??_R1A@... @20527 NONAME
@@ -5303,6 +5307,7 @@
     ??_R2?$PList@... @6234 NONAME
     ??_R2?$PList@... @6235 NONAME
     ??_R2?$PList@... @6236 NONAME
+    ??_R2?$PList@... @25654 NONAME
     ??_R2?$PNatMethodServiceDescriptor@... @16924 NONAME
     ??_R2?$POrdinalDictionary@... @6240 NONAME
     ??_R2?$PSafePtr@... @20572 NONAME
@@ -5872,6 +5877,7 @@
     ??_R3?$PList@... @6991 NONAME
     ??_R3?$PList@... @6992 NONAME
     ??_R3?$PList@... @6993 NONAME
+    ??_R3?$PList@... @25655 NONAME
     ??_R3?$PNatMethodServiceDescriptor@... @16932 NONAME
     ??_R3?$POrdinalDictionary@... @6997 NONAME
     ??_R3?$PSafePtr@... @20613 NONAME
@@ -6441,6 +6447,7 @@
     ??_R4?$PList@...@ @7743 NONAME
     ??_R4?$PList@...@ @7744 NONAME
     ??_R4?$PList@...@ @7745 NONAME
+    ??_R4?$PList@...@ @25656 NONAME
     ??_R4?$PNatMethodServiceDescriptor@...@ @16940 NONAME
     ??_R4?$POrdinalDictionary@...@ @7749 NONAME
     ??_R4?$PSafePtr@...@ @20659 NONAME
@@ -7182,7 +7189,7 @@
     ?AsString@... @20872 NONAME
     ?AsString@... @20873 NONAME
     ?AssureConnect@... @20874 NONAME
-    ?AsUCS2@... @20875 NONAME
+    ?AsUCS2@... @25657 NONAME
     ?AsUnsigned64@... @20876 NONAME
     ?AsUnsigned@... @20877 NONAME
     ?ate@... @8721 NONAME
@@ -7356,6 +7363,7 @@
     ?Class@... @8939 NONAME
     ?Class@... @8940 NONAME
     ?Class@... @8941 NONAME
+    ?Class@... @25658 NONAME
     ?Class@... @8945 NONAME
     ?Class@... @20997 NONAME
     ?Class@... @8948 NONAME
@@ -7682,6 +7690,7 @@
     ?Clone@... @21086 NONAME
     ?Clone@... @21087 NONAME
     ?Clone@... @21088 NONAME
+    ?Clone@... @25659 NONAME
     ?Clone@... @21089 NONAME
     ?Clone@... @21090 NONAME
     ?Clone@... @21091 NONAME
@@ -7897,6 +7906,7 @@
     ?CompareObjectMemoryDirect@... @21301 NONAME
     ?CompareObjectMemoryDirect@... @21302 NONAME
     ?CompareObjectMemoryDirect@... @21303 NONAME
+    ?CompareObjectMemoryDirect@... @25660 NONAME
     ?CompareObjectMemoryDirect@... @21304 NONAME
     ?CompareObjectMemoryDirect@... @21305 NONAME
     ?CompareObjectMemoryDirect@... @21306 NONAME
@@ -9091,6 +9101,7 @@
     ?GetClass@... @22385 NONAME
     ?GetClass@... @22386 NONAME
     ?GetClass@... @22387 NONAME
+    ?GetClass@... @25661 NONAME
     ?GetClass@... @22388 NONAME
     ?GetClass@... @22389 NONAME
     ?GetClass@... @22390 NONAME
@@ -9408,6 +9419,13 @@
     ?GetDescription@... @22691 NONAME
     ?GetDescription@... @22692 NONAME
     ?GetDescription@... @22693 NONAME
+    ?GetDeviceCapabilities@... @25662 NONAME
+    ?GetDeviceCapabilities@... @25663 NONAME
+    ?GetDeviceCapabilities@... @25664 NONAME
+    ?GetDeviceCapabilities@... @25665 NONAME
+    ?GetDeviceCapabilities@... @25666 NONAME
+    ?GetDeviceCapabilities@... @25667 NONAME
+    ?GetDeviceCapabilities@... @25668 NONAME
     ?GetDeviceID@... @22694 NONAME
     ?GetDeviceNames@... @22695 NONAME
     ?GetDeviceNames@... @22696 NONAME
@@ -9604,6 +9622,7 @@
     ?GetInteger@... @22844 NONAME
     ?GetInterface@... @11619 NONAME
     ?GetInterface@... @22845 NONAME
+    ?GetInterface@... @25669 NONAME
     ?GetInterfaceAddress@... @22846 NONAME
     ?GetInterfaceInfo@... @22847 NONAME
     ?GetInterfaceInfo@... @22848 NONAME
@@ -9726,6 +9745,8 @@
     ?GetNatTypeString@... @11749 NONAME
     ?GetNest@... @22948 NONAME
     ?GetNetMask@... @22949 NONAME
+    ?GetNetMask@... @25670 NONAME
+    ?GetNetwork@... @25671 NONAME
     ?GetNetworkInterface@... @11752 NONAME
     ?GetNext@... @22950 NONAME
     ?GetNext@... @22951 NONAME
@@ -9801,6 +9822,7 @@
     ?GetPluginDirs@... @11861 NONAME
     ?GetPluginList@... @23011 NONAME
     ?GetPluginManager@... @11863 NONAME
+    ?GetPluginsDeviceCapabilities@... @25672 NONAME
     ?GetPluginsDeviceNames@... @23012 NONAME
     ?GetPluginsProviding@... @23013 NONAME
     ?GetPluginTypes@... @23014 NONAME
@@ -9870,6 +9892,7 @@
     ?GetReturnCode@... @23074 NONAME
     ?GetRoot@... @23075 NONAME
     ?GetRouteAddress@... @11949 NONAME
+    ?GetRouteInterfaceAddress@... @25673 NONAME
     ?GetRouteTable@... @11950 NONAME
     ?GetSampleRate@... @23076 NONAME
     ?GetSampleRate@... @23077 NONAME
@@ -10223,6 +10246,7 @@
     ?InternalIsDescendant@... @23404 NONAME
     ?InternalIsDescendant@... @23405 NONAME
     ?InternalIsDescendant@... @23406 NONAME
+    ?InternalIsDescendant@... @25674 NONAME
     ?InternalIsDescendant@... @23407 NONAME
     ?InternalIsDescendant@... @23408 NONAME
     ?InternalIsDescendant@... @23409 NONAME
@@ -10936,6 +10960,8 @@
     ?OnSyntaxError@... @24091 NONAME
     ?OnSYST@... @24092 NONAME
     ?OnTextData@... @24093 NONAME
+    ?OnThreadEnded@... @25675 NONAME
+    ?OnThreadStart@... @25676 NONAME
     ?OnTimeout@... @24094 NONAME
     ?OnTOP@... @24095 NONAME
     ?OnTURN@... @24096 NONAME
@@ -11583,7 +11609,7 @@
     ?SetChannel@... @24648 NONAME
     ?SetChannel@... @24649 NONAME
     ?SetChannels@... @24650 NONAME
-    ?SetCharacterSet@... @24651 NONAME
+    ?SetCharacterSet@... @25677 NONAME
     ?SetCharacterSet@... @24652 NONAME
     ?SetCharacterSet@... @24653 NONAME
     ?SetCharacterSet@... @24654 NONAME
@@ -11797,7 +11823,7 @@
     ?SetURLSpace@... @24851 NONAME
     ?SetUserName@... @24852 NONAME
     ?SetUserName@... @24853 NONAME
-    ?SetValue@... @24854 NONAME
+    ?SetValue@... @25678 NONAME
     ?SetValue@... @24855 NONAME
     ?SetValue@... @24856 NONAME
     ?SetValue@... @24857 NONAME

Modified: ptlib/trunk/include/ptlib/msos/ptlibd_2005.dtf
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlibd_2005.dtf	2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptlib/msos/ptlibd_2005.dtf	2007-11-10 02:07:02 UTC (rev 18828)
@@ -691,7 +691,6 @@
     ??0?$PBaseArray@... @542 NONAME
     ??0?$PBaseArray@... @543 NONAME
     ??0?$PBaseArray@... @544 NONAME
-    ??0?$PBaseArray@... @545 NONAME
     ??0?$PBaseArray@... @546 NONAME
     ??0?$PBaseArray@... @547 NONAME
     ??0?$PBaseArray@... @548 NONAME
@@ -713,6 +712,9 @@
     ??0?$PBaseArray@... @18663 NONAME
     ??0?$PBaseArray@... @565 NONAME
     ??0?$PBaseArray@... @566 NONAME
+    ??0?$PBaseArray@... @20514 NONAME
+    ??0?$PBaseArray@... @20515 NONAME
+    ??0?$PBaseArray@... @20516 NONAME
     ??0?$PDevicePluginAdapter@... @567 NONAME
     ??0?$PDevicePluginAdapter@... @568 NONAME
     ??0?$PDevicePluginAdapter@... @569 NONAME
@@ -806,6 +808,8 @@
     ??0?$PList@... @652 NONAME
     ??0?$PList@... @653 NONAME
     ??0?$PList@... @654 NONAME
+    ??0?$PList@... @20517 NONAME
+    ??0?$PList@... @20518 NONAME
     ??0?$PList@... @655 NONAME
     ??0?$PList@... @656 NONAME
     ??0?$PList@... @657 NONAME
@@ -820,9 +824,7 @@
     ??0?$PQueue@... @665 NONAME
     ??0?$PSafePtr@... @18176 NONAME
     ??0?$PScalarArray@... @666 NONAME
-    ??0?$PScalarArray@... @667 NONAME
     ??0?$PScalarArray@... @668 NONAME
-    ??0?$PScalarArray@... @669 NONAME
     ??0?$PScalarArray@... @670 NONAME
     ??0?$PScalarArray@... @671 NONAME
     ??0?$PScalarArray@... @672 NONAME
@@ -1538,7 +1540,7 @@
     ??0PASN_BitString@... @1256 NONAME
     ??0PASN_BitString@... @1257 NONAME
     ??0PASN_BMPString@... @1258 NONAME
-    ??0PASN_BMPString@... @1259 NONAME
+    ??0PASN_BMPString@... @20519 NONAME
     ??0PASN_BMPString@... @1260 NONAME
     ??0PASN_BMPString@... @1261 NONAME
     ??0PASN_Boolean@... @1262 NONAME
@@ -2111,7 +2113,7 @@
     ??0PString@... @1752 NONAME
     ??0PString@... @1753 NONAME
     ??0PString@... @1754 NONAME
-    ??0PString@... @1755 NONAME
+    ??0PString@... @20520 NONAME
     ??0PString@... @1756 NONAME
     ??0PString@... @1757 NONAME
     ??0PString@... @1758 NONAME
@@ -2121,8 +2123,8 @@
     ??0PString@... @1762 NONAME
     ??0PString@... @1763 NONAME
     ??0PString@... @1764 NONAME
-    ??0PString@... @1765 NONAME
-    ??0PString@... @1766 NONAME
+    ??0PString@... @20521 NONAME
+    ??0PString@... @20522 NONAME
     ??0PString@... @1767 NONAME
     ??0PString@... @1768 NONAME
     ??0PString@... @1769 NONAME
@@ -2627,6 +2629,7 @@
     ??1?$PBaseArray@... @2233 NONAME
     ??1?$PBaseArray@... @18804 NONAME
     ??1?$PBaseArray@... @2235 NONAME
+    ??1?$PBaseArray@... @20523 NONAME
     ??1?$PDevicePluginAdapter@... @2236 NONAME
     ??1?$PDevicePluginAdapter@... @2237 NONAME
     ??1?$PDevicePluginAdapter@... @2238 NONAME
@@ -2680,6 +2683,7 @@
     ??1?$PList@... @2282 NONAME
     ??1?$PList@... @2283 NONAME
     ??1?$PList@... @2284 NONAME
+    ??1?$PList@... @20524 NONAME
     ??1?$PList@... @2285 NONAME
     ??1?$PList@... @2286 NONAME
     ??1?$PNatMethodServiceDescriptor@... @17379 NONAME
@@ -3737,6 +3741,7 @@
     ??2?$PBaseArray@... @18901 NONAME
     ??2?$PBaseArray@... @18902 NONAME
     ??2?$PBaseArray@... @18903 NONAME
+    ??2?$PBaseArray@... @20525 NONAME
     ??2?$PDictionary@... @18904 NONAME
     ??2?$PDictionary@... @18905 NONAME
     ??2?$PDictionary@... @18906 NONAME
@@ -3770,6 +3775,7 @@
     ??2?$PList@... @18934 NONAME
     ??2?$PList@... @18935 NONAME
     ??2?$PList@... @18936 NONAME
+    ??2?$PList@... @20526 NONAME
     ??2?$PList@... @18937 NONAME
     ??2?$PList@... @18938 NONAME
     ??2?$POrdinalDictionary@... @18939 NONAME
@@ -4016,6 +4022,8 @@
     ??3?$PBaseArray@... @19179 NONAME
     ??3?$PBaseArray@... @19180 NONAME
     ??3?$PBaseArray@... @19181 NONAME
+    ??3?$PBaseArray@... @20527 NONAME
+    ??3?$PBaseArray@... @20528 NONAME
     ??3?$PDictionary@... @19182 NONAME
     ??3?$PDictionary@... @19183 NONAME
     ??3?$PDictionary@... @19184 NONAME
@@ -4082,6 +4090,8 @@
     ??3?$PList@... @19245 NONAME
     ??3?$PList@... @19246 NONAME
     ??3?$PList@... @19247 NONAME
+    ??3?$PList@... @20529 NONAME
+    ??3?$PList@... @20530 NONAME
     ??3?$PList@... @19248 NONAME
     ??3?$PList@... @19249 NONAME
     ??3?$PList@... @19250 NONAME
@@ -4640,6 +4650,7 @@
     ??4?$PBaseArray@... @3183 NONAME
     ??4?$PBaseArray@... @3184 NONAME
     ??4?$PBaseArray@... @3185 NONAME
+    ??4?$PBaseArray@... @20531 NONAME
     ??4?$PList@... @3186 NONAME
     ??4?$PList@... @18239 NONAME
     ??4?$PList@... @3187 NONAME
@@ -4754,7 +4765,7 @@
     ??4PASN_Array@... @3277 NONAME
     ??4PASN_BitString@... @3278 NONAME
     ??4PASN_BMPString@... @3279 NONAME
-    ??4PASN_BMPString@... @3280 NONAME
+    ??4PASN_BMPString@... @20532 NONAME
     ??4PASN_Boolean@... @3281 NONAME
     ??4PASN_Choice@... @3282 NONAME
     ??4PASN_ConstrainedObject@... @3283 NONAME
@@ -5016,7 +5027,6 @@
     ??A?$PBaseArray@... @3501 NONAME
     ??A?$PBaseArray@... @3502 NONAME
     ??A?$PBaseArray@... @3503 NONAME
-    ??A?$PBaseArray@... @3504 NONAME
     ??A?$PBaseArray@... @3505 NONAME
     ??A?$PBaseArray@... @3506 NONAME
     ??A?$PBaseArray@... @3507 NONAME
@@ -5029,6 +5039,8 @@
     ??A?$PBaseArray@... @19825 NONAME
     ??A?$PBaseArray@... @19826 NONAME
     ??A?$PBaseArray@... @3516 NONAME
+    ??A?$PBaseArray@... @20533 NONAME
+    ??A?$PBaseArray@... @20534 NONAME
     ??A?$PDictionary@... @3517 NONAME
     ??A?$PDictionary@... @3518 NONAME
     ??A?$PList@... @3519 NONAME
@@ -5094,6 +5106,7 @@
     ??B?$PBaseArray@... @3578 NONAME
     ??B?$PBaseArray@... @19828 NONAME
     ??B?$PBaseArray@... @3580 NONAME
+    ??B?$PBaseArray@... @20535 NONAME
     ??B?$PSafePtr@... @18252 NONAME
     ??BAddress@... @3581 NONAME
     ??BAddress@... @3582 NONAME
@@ -5575,6 +5588,7 @@
     ??_7?$PBaseArray@...@ @3958 NONAME
     ??_7?$PBaseArray@...@ @19891 NONAME
     ??_7?$PBaseArray@...@ @3960 NONAME
+    ??_7?$PBaseArray@...@ @20536 NONAME
     ??_7?$PDevicePluginAdapter@...@ @3961 NONAME
     ??_7?$PDevicePluginAdapter@...@ @3962 NONAME
     ??_7?$PDevicePluginAdapter@...@ @3963 NONAME
@@ -5628,6 +5642,7 @@
     ??_7?$PList@...@ @4007 NONAME
     ??_7?$PList@...@ @4008 NONAME
     ??_7?$PList@...@ @4009 NONAME
+    ??_7?$PList@...@ @20537 NONAME
     ??_7?$PList@...@ @4010 NONAME
     ??_7?$PList@...@ @4011 NONAME
     ??_7?$PNatMethodServiceDescriptor@...@ @17451 NONAME
@@ -6699,6 +6714,7 @@
     ??_R0?AV?$PBaseArray@... @5013 NONAME
     ??_R0?AV?$PBaseArray@... @19926 NONAME
     ??_R0?AV?$PBaseArray@... @5015 NONAME
+    ??_R0?AV?$PBaseArray@... @20538 NONAME
     ??_R0?AV?$PDevicePluginAdapter@... @5016 NONAME
     ??_R0?AV?$PDevicePluginAdapter@... @5017 NONAME
     ??_R0?AV?$PDevicePluginAdapter@... @5018 NONAME
@@ -6752,6 +6768,7 @@
     ??_R0?AV?$PList@... @5062 NONAME
     ??_R0?AV?$PList@... @5063 NONAME
     ??_R0?AV?$PList@... @5064 NONAME
+    ??_R0?AV?$PList@... @20539 NONAME
     ??_R0?AV?$PList@... @5065 NONAME
     ??_R0?AV?$PList@... @5066 NONAME
     ??_R0?AV?$PNatMethodServiceDescriptor@... @17460 NONAME
@@ -7493,6 +7510,7 @@
     ??_R1A@... @5751 NONAME
     ??_R1A@... @19955 NONAME
     ??_R1A@... @5753 NONAME
+    ??_R1A@... @20540 NONAME
     ??_R1A@... @5754 NONAME
     ??_R1A@... @5755 NONAME
     ??_R1A@... @5756 NONAME
@@ -7546,6 +7564,7 @@
     ??_R1A@... @5800 NONAME
     ??_R1A@... @5801 NONAME
     ??_R1A@... @5802 NONAME
+    ??_R1A@... @20541 NONAME
     ??_R1A@... @5803 NONAME
     ??_R1A@... @5804 NONAME
     ??_R1A@... @17468 NONAME
@@ -8342,6 +8361,7 @@
     ??_R2?$PBaseArray@... @6540 NONAME
     ??_R2?$PBaseArray@... @19987 NONAME
     ??_R2?$PBaseArray@... @6542 NONAME
+    ??_R2?$PBaseArray@... @20542 NONAME
     ??_R2?$PDevicePluginAdapter@... @6543 NONAME
     ??_R2?$PDevicePluginAdapter@... @6544 NONAME
     ??_R2?$PDevicePluginAdapter@... @6545 NONAME
@@ -8395,6 +8415,7 @@
     ??_R2?$PList@... @6589 NONAME
     ??_R2?$PList@... @6590 NONAME
     ??_R2?$PList@... @6591 NONAME
+    ??_R2?$PList@... @20543 NONAME
     ??_R2?$PList@... @6592 NONAME
     ??_R2?$PList@... @6593 NONAME
     ??_R2?$PNatMethodServiceDescriptor@... @17477 NONAME
@@ -9154,6 +9175,7 @@
     ??_R3?$PBaseArray@... @7296 NONAME
     ??_R3?$PBaseArray@... @20016 NONAME
     ??_R3?$PBaseArray@... @7298 NONAME
+    ??_R3?$PBaseArray@... @20544 NONAME
     ??_R3?$PDevicePluginAdapter@... @7299 NONAME
     ??_R3?$PDevicePluginAdapter@... @7300 NONAME
     ??_R3?$PDevicePluginAdapter@... @7301 NONAME
@@ -9207,6 +9229,7 @@
     ??_R3?$PList@... @7345 NONAME
     ??_R3?$PList@... @7346 NONAME
     ??_R3?$PList@... @7347 NONAME
+    ??_R3?$PList@... @20545 NONAME
     ??_R3?$PList@... @7348 NONAME
     ??_R3?$PList@... @7349 NONAME
     ??_R3?$PNatMethodServiceDescriptor@... @17485 NONAME
@@ -9961,6 +9984,7 @@
     ??_R4?$PBaseArray@...@ @8047 NONAME
     ??_R4?$PBaseArray@...@ @20045 NONAME
     ??_R4?$PBaseArray@...@ @8049 NONAME
+    ??_R4?$PBaseArray@...@ @20546 NONAME
     ??_R4?$PDevicePluginAdapter@...@ @8050 NONAME
     ??_R4?$PDevicePluginAdapter@...@ @8051 NONAME
     ??_R4?$PDevicePluginAdapter@...@ @8052 NONAME
@@ -10014,6 +10038,7 @@
     ??_R4?$PList@...@ @8096 NONAME
     ??_R4?$PList@...@ @8097 NONAME
     ??_R4?$PList@...@ @8098 NONAME
+    ??_R4?$PList@...@ @20547 NONAME
     ??_R4?$PList@...@ @8099 NONAME
     ??_R4?$PList@...@ @8100 NONAME
     ??_R4?$PNatMethodServiceDescriptor@...@ @17493 NONAME
@@ -11057,7 +11082,7 @@
     ?AsString@... @9061 NONAME
     ?AsString@... @9062 NONAME
     ?AssureConnect@... @9063 NONAME
-    ?AsUCS2@... @9064 NONAME
+    ?AsUCS2@... @20548 NONAME
     ?AsUnsigned64@... @9065 NONAME
     ?AsUnsigned@... @9066 NONAME
     ?AsXML@... @9067 NONAME
@@ -11271,6 +11296,7 @@
     ?Class@... @9259 NONAME
     ?Class@... @20096 NONAME
     ?Class@... @9261 NONAME
+    ?Class@... @20549 NONAME
     ?Class@... @9262 NONAME
     ?Class@... @9263 NONAME
     ?Class@... @9264 NONAME
@@ -11304,6 +11330,7 @@
     ?Class@... @9292 NONAME
     ?Class@... @9293 NONAME
     ?Class@... @9294 NONAME
+    ?Class@... @20550 NONAME
     ?Class@... @9295 NONAME
     ?Class@... @9296 NONAME
     ?Class@... @9297 NONAME
@@ -11736,6 +11763,7 @@
     ?Clone@... @9680 NONAME
     ?Clone@... @20125 NONAME
     ?Clone@... @9682 NONAME
+    ?Clone@... @20551 NONAME
     ?Clone@... @9683 NONAME
     ?Clone@... @9684 NONAME
     ?Clone@... @9685 NONAME
@@ -11769,6 +11797,7 @@
     ?Clone@... @9713 NONAME
     ?Clone@... @9714 NONAME
     ?Clone@... @9715 NONAME
+    ?Clone@... @20552 NONAME
     ?Clone@... @9716 NONAME
     ?Clone@... @9717 NONAME
     ?Clone@... @9718 NONAME
@@ -12019,6 +12048,7 @@
     ?CompareObjectMemoryDirect@... @9928 NONAME
     ?CompareObjectMemoryDirect@... @20152 NONAME
     ?CompareObjectMemoryDirect@... @9930 NONAME
+    ?CompareObjectMemoryDirect@... @20553 NONAME
     ?CompareObjectMemoryDirect@... @9931 NONAME
     ?CompareObjectMemoryDirect@... @9932 NONAME
     ?CompareObjectMemoryDirect@... @9933 NONAME
@@ -12052,6 +12082,7 @@
     ?CompareObjectMemoryDirect@... @9961 NONAME
     ?CompareObjectMemoryDirect@... @9962 NONAME
     ?CompareObjectMemoryDirect@... @9963 NONAME
+    ?CompareObjectMemoryDirect@... @20554 NONAME
     ?CompareObjectMemoryDirect@... @9964 NONAME
     ?CompareObjectMemoryDirect@... @9965 NONAME
     ?CompareObjectMemoryDirect@... @9966 NONAME
@@ -13497,6 +13528,7 @@
     ?GetAt@... @11228 NONAME
     ?GetAt@... @20247 NONAME
     ?GetAt@... @11230 NONAME
+    ?GetAt@... @20555 NONAME
     ?GetAt@... @11231 NONAME
     ?GetAt@... @11232 NONAME
     ?GetAt@... @11233 NONAME
@@ -13579,6 +13611,7 @@
     ?GetClass@... @11301 NONAME
     ?GetClass@... @20252 NONAME
     ?GetClass@... @11303 NONAME
+    ?GetClass@... @20556 NONAME
     ?GetClass@... @11304 NONAME
     ?GetClass@... @11305 NONAME
     ?GetClass@... @11306 NONAME
@@ -13612,6 +13645,7 @@
     ?GetClass@... @11334 NONAME
     ?GetClass@... @11335 NONAME
     ?GetClass@... @11336 NONAME
+    ?GetClass@... @20557 NONAME
     ?GetClass@... @11337 NONAME
     ?GetClass@... @11338 NONAME
     ?GetClass@... @11339 NONAME
@@ -14063,6 +14097,13 @@
     ?GetDescription@... @11745 NONAME
     ?GetDescription@... @11746 NONAME
     ?GetDescription@... @11747 NONAME
+    ?GetDeviceCapabilities@... @20558 NONAME
+    ?GetDeviceCapabilities@... @20559 NONAME
+    ?GetDeviceCapabilities@... @20560 NONAME
+    ?GetDeviceCapabilities@... @20561 NONAME
+    ?GetDeviceCapabilities@... @20562 NONAME
+    ?GetDeviceCapabilities@... @20563 NONAME
+    ?GetDeviceCapabilities@... @20564 NONAME
     ?GetDeviceID@... @18532 NONAME
     ?GetDeviceID@... @11748 NONAME
     ?GetDeviceNames@... @17547 NONAME
@@ -14307,6 +14348,7 @@
     ?GetInteger@... @11973 NONAME
     ?GetInterface@... @11974 NONAME
     ?GetInterface@... @18395 NONAME
+    ?GetInterface@... @20565 NONAME
     ?GetInterfaceAddress@... @11975 NONAME
     ?GetInterfaceInfo@... @18396 NONAME
     ?GetInterfaceInfo@... @18397 NONAME
@@ -14455,6 +14497,8 @@
     ?GetNatTypeString@... @12104 NONAME
     ?GetNest@... @12105 NONAME
     ?GetNetMask@... @12106 NONAME
+    ?GetNetMask@... @20566 NONAME
+    ?GetNetwork@... @20567 NONAME
     ?GetNetworkInterface@... @12107 NONAME
     ?GetNext@... @12108 NONAME
     ?GetNext@... @12109 NONAME
@@ -14568,6 +14612,7 @@
     ?GetPluginDirs@... @12216 NONAME
     ?GetPluginList@... @12217 NONAME
     ?GetPluginManager@... @12218 NONAME
+    ?GetPluginsDeviceCapabilities@... @20568 NONAME
     ?GetPluginsDeviceNames@... @12219 NONAME
     ?GetPluginsProviding@... @12220 NONAME
     ?GetPluginTypes@... @12221 NONAME
@@ -14581,6 +14626,7 @@
     ?GetPointer@... @12229 NONAME
     ?GetPointer@... @12230 NONAME
     ?GetPointer@... @12231 NONAME
+    ?GetPointer@... @20569 NONAME
     ?GetPointer@... @12232 NONAME
     ?GetPointer@... @12233 NONAME
     ?GetPointer@... @12234 NONAME
@@ -14659,6 +14705,7 @@
     ?GetRoot@... @12302 NONAME
     ?GetRootElement@... @12303 NONAME
     ?GetRouteAddress@... @12304 NONAME
+    ?GetRouteInterfaceAddress@... @20570 NONAME
     ?GetRouteTable@... @12305 NONAME
     ?GetSampleRate@... @12306 NONAME
     ?GetSampleRate@... @12307 NONAME
@@ -15079,7 +15126,7 @@
     ?InternalCompleteDigest@... @12686 NONAME
     ?InternalCompleteDigest@... @12687 NONAME
     ?InternalEndRead@... @12688 NONAME
-    ?InternalFromUCS2@... @12689 NONAME
+    ?InternalFromUCS2@... @20571 NONAME
     ?InternalGetData@... @12690 NONAME
     ?InternalIsDescendant@... @12691 NONAME
     ?InternalIsDescendant@... @12692 NONAME
@@ -15102,6 +15149,7 @@
     ?InternalIsDescendant@... @12709 NONAME
     ?InternalIsDescendant@... @20305 NONAME
     ?InternalIsDescendant@... @12711 NONAME
+    ?InternalIsDescendant@... @20572 NONAME
     ?InternalIsDescendant@... @12712 NONAME
     ?InternalIsDescendant@... @12713 NONAME
     ?InternalIsDescendant@... @12714 NONAME
@@ -15135,6 +15183,7 @@
     ?InternalIsDescendant@... @12742 NONAME
     ?InternalIsDescendant@... @12743 NONAME
     ?InternalIsDescendant@... @12744 NONAME
+    ?InternalIsDescendant@... @20573 NONAME
     ?InternalIsDescendant@... @12745 NONAME
     ?InternalIsDescendant@... @12746 NONAME
     ?InternalIsDescendant@... @12747 NONAME
@@ -16159,6 +16208,8 @@
     ?OnSyntaxError@... @13680 NONAME
     ?OnSYST@... @13681 NONAME
     ?OnTextData@... @13682 NONAME
+    ?OnThreadEnded@... @20574 NONAME
+    ?OnThreadStart@... @20575 NONAME
     ?OnTimeout@... @13683 NONAME
     ?OnTOP@... @13684 NONAME
     ?OnTURN@... @13686 NONAME
@@ -16456,6 +16507,7 @@
     ?PrintElementOn@... @13961 NONAME
     ?PrintElementOn@... @20360 NONAME
     ?PrintElementOn@... @13963 NONAME
+    ?PrintElementOn@... @20576 NONAME
     ?PrintElementOn@... @13964 NONAME
     ?PrintOn@... @13965 NONAME
     ?PrintOn@... @13966 NONAME
@@ -17102,7 +17154,7 @@
     ?SetChannel@... @14565 NONAME
     ?SetChannel@... @14566 NONAME
     ?SetChannels@... @14567 NONAME
-    ?SetCharacterSet@... @14568 NONAME
+    ?SetCharacterSet@... @20577 NONAME
     ?SetCharacterSet@... @14569 NONAME
     ?SetCharacterSet@... @14570 NONAME
     ?SetCharacterSet@... @14571 NONAME
@@ -17408,7 +17460,7 @@
     ?SetUserName@... @14855 NONAME
     ?SetValue@... @14856 NONAME
     ?SetValue@... @14857 NONAME
-    ?SetValue@... @14858 NONAME
+    ?SetValue@... @20578 NONAME
     ?SetValue@... @14859 NONAME
     ?SetValue@... @14860 NONAME
     ?SetValue@... @14861 NONAME

Modified: ptlib/trunk/include/ptlib/msos/ptlibd_2005_wm.dtf
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlibd_2005_wm.dtf	2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptlib/msos/ptlibd_2005_wm.dtf	2007-11-10 02:07:02 UTC (rev 18828)
@@ -683,14 +683,14 @@
     ??0?$PList@... @18453 NONAME
     ??0?$PList@... @18454 NONAME
     ??0?$PList@... @18455 NONAME
+    ??0?$PList@... @26779 NONAME
+    ??0?$PList@... @26780 NONAME
     ??0?$PNatMethodServiceDescriptor@... @18456 NONAME
     ??0?$POrdinalDictionary@... @18457 NONAME
     ??0?$POrdinalDictionary@... @18458 NONAME
     ??0?$PSafePtr@... @18459 NONAME
     ??0?$PScalarArray@... @18460 NONAME
-    ??0?$PScalarArray@... @18461 NONAME
     ??0?$PScalarArray@... @18462 NONAME
-    ??0?$PScalarArray@... @18463 NONAME
     ??0?$PScalarArray@... @18464 NONAME
     ??0?$PScalarArray@... @18465 NONAME
     ??0?$PScalarArray@... @18466 NONAME
@@ -1261,7 +1261,7 @@
     ??0PASN_BitString@... @19031 NONAME
     ??0PASN_BitString@... @19032 NONAME
     ??0PASN_BMPString@... @19033 NONAME
-    ??0PASN_BMPString@... @19034 NONAME
+    ??0PASN_BMPString@... @26781 NONAME
     ??0PASN_BMPString@... @19035 NONAME
     ??0PASN_BMPString@... @19036 NONAME
     ??0PASN_Boolean@... @19037 NONAME
@@ -1676,7 +1676,7 @@
     ??0PString@... @19446 NONAME
     ??0PString@... @19447 NONAME
     ??0PString@... @19448 NONAME
-    ??0PString@... @19449 NONAME
+    ??0PString@... @26782 NONAME
     ??0PString@... @19450 NONAME
     ??0PString@... @19451 NONAME
     ??0PString@... @19452 NONAME
@@ -2126,6 +2126,7 @@
     ??1?$PList@... @19895 NONAME
     ??1?$PList@... @19896 NONAME
     ??1?$PList@... @19897 NONAME
+    ??1?$PList@... @26783 NONAME
     ??1?$PNatMethodServiceDescriptor@... @19898 NONAME
     ??1?$POrdinalDictionary@... @19899 NONAME
     ??1?$PSafePtr@... @19900 NONAME
@@ -2992,7 +2993,7 @@
     ??4PASN_Array@... @20759 NONAME
     ??4PASN_BitString@... @20760 NONAME
     ??4PASN_BMPString@... @20761 NONAME
-    ??4PASN_BMPString@... @20762 NONAME
+    ??4PASN_BMPString@... @26784 NONAME
     ??4PASN_Boolean@... @20763 NONAME
     ??4PASN_Choice@... @20764 NONAME
     ??4PASN_ConstrainedObject@... @20765 NONAME
@@ -3762,6 +3763,7 @@
     ??_7?$PList@...@ @4006 NONAME
     ??_7?$PList@...@ @4007 NONAME
     ??_7?$PList@...@ @4008 NONAME
+    ??_7?$PList@...@ @26785 NONAME
     ??_7?$PNatMethodServiceDescriptor@...@ @17451 NONAME
     ??_7?$POrdinalDictionary@...@ @4012 NONAME
     ??_7?$PSafePtr@...@ @21466 NONAME
@@ -4547,6 +4549,7 @@
     ??_R0?AV?$PList@... @5061 NONAME
     ??_R0?AV?$PList@... @5062 NONAME
     ??_R0?AV?$PList@... @5063 NONAME
+    ??_R0?AV?$PList@... @26786 NONAME
     ??_R0?AV?$PNatMethodServiceDescriptor@... @17460 NONAME
     ??_R0?AV?$POrdinalDictionary@... @5067 NONAME
     ??_R0?AV?$PSafePtr@... @21583 NONAME
@@ -5125,6 +5128,7 @@
     ??_R1A@... @5799 NONAME
     ??_R1A@... @5800 NONAME
     ??_R1A@... @5801 NONAME
+    ??_R1A@... @26787 NONAME
     ??_R1A@... @17468 NONAME
     ??_R1A@... @5805 NONAME
     ??_R1A@... @21624 NONAME
@@ -5727,6 +5731,7 @@
     ??_R2?$PList@... @6588 NONAME
     ??_R2?$PList@... @6589 NONAME
     ??_R2?$PList@... @6590 NONAME
+    ??_R2?$PList@... @26788 NONAME
     ??_R2?$PNatMethodServiceDescriptor@... @17477 NONAME
     ??_R2?$POrdinalDictionary@... @6594 NONAME
     ??_R2?$PSafePtr@... @21669 NONAME
@@ -6295,6 +6300,7 @@
     ??_R3?$PList@... @7344 NONAME
     ??_R3?$PList@... @7345 NONAME
     ??_R3?$PList@... @7346 NONAME
+    ??_R3?$PList@... @26789 NONAME
     ??_R3?$PNatMethodServiceDescriptor@... @17485 NONAME
     ??_R3?$POrdinalDictionary@... @7350 NONAME
     ??_R3?$PSafePtr@... @21710 NONAME
@@ -6863,6 +6869,7 @@
     ??_R4?$PList@...@ @8095 NONAME
     ??_R4?$PList@...@ @8096 NONAME
     ??_R4?$PList@...@ @8097 NONAME
+    ??_R4?$PList@...@ @26790 NONAME
     ??_R4?$PNatMethodServiceDescriptor@...@ @17493 NONAME
     ??_R4?$POrdinalDictionary@...@ @8101 NONAME
     ??_R4?$PSafePtr@...@ @21756 NONAME
@@ -7603,7 +7610,7 @@
     ?AsString@... @21969 NONAME
     ?AsString@... @21970 NONAME
     ?AssureConnect@... @21971 NONAME
-    ?AsUCS2@... @21972 NONAME
+    ?AsUCS2@... @26791 NONAME
     ?AsUnsigned64@... @21973 NONAME
     ?AsUnsigned@... @21974 NONAME
     ?ate@... @9073 NONAME
@@ -7777,6 +7784,7 @@
     ?Class@... @9291 NONAME
     ?Class@... @9292 NONAME
     ?Class@... @9293 NONAME
+    ?Class@... @26792 NONAME
     ?Class@... @9297 NONAME
     ?Class@... @22094 NONAME
     ?Class@... @9300 NONAME
@@ -8103,6 +8111,7 @@
     ?Clone@... @22183 NONAME
     ?Clone@... @22184 NONAME
     ?Clone@... @22185 NONAME
+    ?Clone@... @26793 NONAME
     ?Clone@... @22186 NONAME
     ?Clone@... @22187 NONAME
     ?Clone@... @22188 NONAME
@@ -8318,6 +8327,7 @@
     ?CompareObjectMemoryDirect@... @22398 NONAME
     ?CompareObjectMemoryDirect@... @22399 NONAME
     ?CompareObjectMemoryDirect@... @22400 NONAME
+    ?CompareObjectMemoryDirect@... @26794 NONAME
     ?CompareObjectMemoryDirect@... @22401 NONAME
     ?CompareObjectMemoryDirect@... @22402 NONAME
     ?CompareObjectMemoryDirect@... @22403 NONAME
@@ -9512,6 +9522,7 @@
     ?GetClass@... @23482 NONAME
     ?GetClass@... @23483 NONAME
     ?GetClass@... @23484 NONAME
+    ?GetClass@... @26795 NONAME
     ?GetClass@... @23485 NONAME
     ?GetClass@... @23486 NONAME
     ?GetClass@... @23487 NONAME
@@ -9829,6 +9840,13 @@
     ?GetDescription@... @23788 NONAME
     ?GetDescription@... @23789 NONAME
     ?GetDescription@... @23790 NONAME
+    ?GetDeviceCapabilities@... @26796 NONAME
+    ?GetDeviceCapabilities@... @26797 NONAME
+    ?GetDeviceCapabilities@... @26798 NONAME
+    ?GetDeviceCapabilities@... @26799 NONAME
+    ?GetDeviceCapabilities@... @26800 NONAME
+    ?GetDeviceCapabilities@... @26801 NONAME
+    ?GetDeviceCapabilities@... @26802 NONAME
     ?GetDeviceID@... @23791 NONAME
     ?GetDeviceNames@... @23792 NONAME
     ?GetDeviceNames@... @23793 NONAME
@@ -10025,6 +10043,7 @@
     ?GetInteger@... @23941 NONAME
     ?GetInterface@... @11974 NONAME
     ?GetInterface@... @23942 NONAME
+    ?GetInterface@... @26803 NONAME
     ?GetInterfaceAddress@... @23943 NONAME
     ?GetInterfaceInfo@... @23944 NONAME
     ?GetInterfaceInfo@... @23945 NONAME
@@ -10147,6 +10166,8 @@
     ?GetNatTypeString@... @12104 NONAME
     ?GetNest@... @24045 NONAME
     ?GetNetMask@... @24046 NONAME
+    ?GetNetMask@... @26804 NONAME
+    ?GetNetwork@... @26805 NONAME
     ?GetNetworkInterface@... @12107 NONAME
     ?GetNext@... @24047 NONAME
     ?GetNext@... @24048 NONAME
@@ -10222,6 +10243,7 @@
     ?GetPluginDirs@... @12216 NONAME
     ?GetPluginList@... @24108 NONAME
     ?GetPluginManager@... @12218 NONAME
+    ?GetPluginsDeviceCapabilities@... @26806 NONAME
     ?GetPluginsDeviceNames@... @24109 NONAME
     ?GetPluginsProviding@... @24110 NONAME
     ?GetPluginTypes@... @24111 NONAME
@@ -10291,6 +10313,7 @@
     ?GetReturnCode@... @24171 NONAME
     ?GetRoot@... @24172 NONAME
     ?GetRouteAddress@... @12304 NONAME
+    ?GetRouteInterfaceAddress@... @26807 NONAME
     ?GetRouteTable@... @12305 NONAME
     ?GetSampleRate@... @24173 NONAME
     ?GetSampleRate@... @24174 NONAME
@@ -10644,6 +10667,7 @@
     ?InternalIsDescendant@... @24501 NONAME
     ?InternalIsDescendant@... @24502 NONAME
     ?InternalIsDescendant@... @24503 NONAME
+    ?InternalIsDescendant@... @26808 NONAME
     ?InternalIsDescendant@... @24504 NONAME
     ?InternalIsDescendant@... @24505 NONAME
     ?InternalIsDescendant@... @24506 NONAME
@@ -11358,6 +11382,8 @@
     ?OnSyntaxError@... @25189 NONAME
     ?OnSYST@... @25190 NONAME
     ?OnTextData@... @25191 NONAME
+    ?OnThreadEnded@... @26809 NONAME
+    ?OnThreadStart@... @26810 NONAME
     ?OnTimeout@... @25192 NONAME
     ?OnTOP@... @25193 NONAME
     ?OnTURN@... @25194 NONAME
@@ -12005,7 +12031,7 @@
     ?SetChannel@... @25746 NONAME
     ?SetChannel@... @25747 NONAME
     ?SetChannels@... @25748 NONAME
-    ?SetCharacterSet@... @25749 NONAME
+    ?SetCharacterSet@... @26811 NONAME
     ?SetCharacterSet@... @25750 NONAME
     ?SetCharacterSet@... @25751 NONAME
     ?SetCharacterSet@... @25752 NONAME
@@ -12219,7 +12245,7 @@
     ?SetURLSpace@... @25949 NONAME
     ?SetUserName@... @25950 NONAME
     ?SetUserName@... @25951 NONAME
-    ?SetValue@... @25952 NONAME
+    ?SetValue@... @26812 NONAME

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18858] ptlib/trunk

From: <shorne@us...> - 2007-11-13 14:21

Revision: 18858
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18858&view=rev
Author:   shorne
Date:     2007-11-13 06:20:59 -0800 (Tue, 13 Nov 2007)

Log Message:
-----------
Fix errors when compiling with exceptions thx David Sayada

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/src/ptlib/unix/assert.cxx

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2007-11-13 07:53:39 UTC (rev 18857)
+++ ptlib/trunk/configure	2007-11-13 14:20:59 UTC (rev 18858)
@@ -895,7 +895,7 @@
   --enable-oss            enable OSS audio support
   --enable-memcheck       enable leak testing code (off by default)
   --disable-odbc          disable ODBC support
-  --exceptions            enable C++ exceptions
+  --enable-exceptions     enable C++ exceptions
 
 Some influential environment variables:
   CXX         C++ compiler command

Modified: ptlib/trunk/src/ptlib/unix/assert.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/assert.cxx	2007-11-13 07:53:39 UTC (rev 18857)
+++ ptlib/trunk/src/ptlib/unix/assert.cxx	2007-11-13 14:20:59 UTC (rev 18858)
@@ -104,6 +104,7 @@
 
 #include <ctype.h>
 #include <signal.h>
+#include <stdexcept>
 #include <ptlib/pprocess.h>
 
 #ifndef __BEOS__
@@ -177,16 +178,18 @@
   if (&trace != &PError)
     PError << msg << endl;
 
+  char *env;
+
 #if P_EXCEPTIONS
   //Throw a runtime exception if the environment variable PWLIB_ASSERT_EXCEPTION is set
-  char * env = ::getenv("PWLIB_ASSERT_EXCEPTION");
+  env = ::getenv("PWLIB_ASSERT_EXCEPTION");
   if (env != NULL){
     throw std::runtime_error(msg);
   }
 #endif
   
 #ifndef P_VXWORKS
-  char * env = ::getenv("PWLIB_ASSERT_ACTION");
+  env = ::getenv("PWLIB_ASSERT_ACTION");
   if (env != NULL && *env != EOF && PAssertAction(*env, msg)) {
     inAssert = FALSE;
     return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18873] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-16 04:24

Revision: 18873
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18873&view=rev
Author:   rjongbloed
Date:     2007-11-15 20:24:04 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
Added function to PStringToString dictionary which returns the dictionary as an array of C style strings, optionally of key=value form similar to shell environment, or adjacent strings in the array being key/value pairs.

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/pstring.h
    ptlib/trunk/src/ptlib/common/contain.cxx

Modified: ptlib/trunk/include/ptlib/pstring.h
===================================================================
--- ptlib/trunk/include/ptlib/pstring.h	2007-11-16 01:00:21 UTC (rev 18872)
+++ ptlib/trunk/include/ptlib/pstring.h	2007-11-16 04:24:04 UTC (rev 18873)
@@ -2350,7 +2350,7 @@
     PStringArray operator + (const PString & str);
 
     /**Create an array of C strings.
-       If storage is NULL then this returns a single pointer that may be
+       If storage is NULL then this returns a single pointer that must be
        disposed of using free(). Note that each of the strings are part of the
        same memory allocation so only one free() is required.
 
@@ -3045,6 +3045,23 @@
       istream &strm   // Stream to read the objects contents from.
     );
   //@}
+
+    /**Create an array of C strings.
+       If withEqualSign is true then array is GetSize()+1 strings of the form
+       key=value. If false then the array is GetSize()*2+1 strings where
+       consecutive pointers are the key and option respecitively of each
+       entry in the dictionary.
+
+       If storage is NULL then this returns a single pointer that must be
+       disposed of using free(). Note that each of the strings are part of the
+       same memory allocation so only one free() is required.
+
+       If storage is not null then that is used to allocate the memory.
+      */
+    char ** ToCharArray(
+      bool withEqualSign,
+      PCharArray * storage = NULL
+    ) const;
 };
 
 

Modified: ptlib/trunk/src/ptlib/common/contain.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/contain.cxx	2007-11-16 01:00:21 UTC (rev 18872)
+++ ptlib/trunk/src/ptlib/common/contain.cxx	2007-11-16 04:24:04 UTC (rev 18873)
@@ -2857,6 +2857,13 @@
 }
 
 
+static void strcpy_with_increment(char * & strPtr, const PString & str)
+{
+  PINDEX len = str.GetLength()+1;
+  memcpy(strPtr, (const char *)str, len);
+  strPtr += len;
+}
+
 char ** PStringArray::ToCharArray(PCharArray * storage) const
 {
   PINDEX i;
@@ -2875,14 +2882,11 @@
   if (storagePtr == NULL)
     return NULL;
 
-  char * strPtr = (char *)&storagePtr[GetSize()+1];
+  char * strPtr = (char *)&storagePtr[mySize+1];
 
   for (i = 0; i < mySize; i++) {
     storagePtr[i] = strPtr;
-    const PString & str = (*this)[i];
-    PINDEX len = str.GetLength()+1;
-    memcpy(strPtr, (const char *)str, len);
-    strPtr += len;
+    strcpy_with_increment(strPtr, (*this)[i]);
   }
 
   storagePtr[i] = NULL;
@@ -3176,6 +3180,45 @@
 }
 
 
+char ** PStringToString::ToCharArray(bool withEqualSign, PCharArray * storage) const
+{
+  PINDEX i;
+
+  PINDEX mySize = GetSize();
+  PINDEX numPointers = mySize*(withEqualSign ? 1 : 2) + 1;
+  PINDEX storageSize = numPointers*sizeof(char *);
+  for (i = 0; i < mySize; i++)
+    storageSize += GetKeyAt(i).GetLength()+1 + GetDataAt(i).GetLength()+1;
+
+  char ** storagePtr;
+  if (storage != NULL)
+    storagePtr = (char **)storage->GetPointer(storageSize);
+  else
+    storagePtr = (char **)malloc(storageSize);
+
+  if (storagePtr == NULL)
+    return NULL;
+
+  char * strPtr = (char *)&storagePtr[numPointers];
+  PINDEX strIndex = 0;
+
+  for (i = 0; i < mySize; i++) {
+    storagePtr[strIndex++] = strPtr;
+    if (withEqualSign)
+      strcpy_with_increment(strPtr, GetKeyAt(i) + '=' + GetDataAt(i));
+    else {
+      strcpy_with_increment(strPtr, GetKeyAt(i));
+      storagePtr[strIndex++] = strPtr;
+      strcpy_with_increment(strPtr, GetDataAt(i));
+    }
+  }
+
+  storagePtr[strIndex] = NULL;
+
+  return storagePtr;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 
 PRegularExpression::PRegularExpression()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18884] ptlib/trunk

From: <hfriederich@us...> - 2007-11-17 14:22

Revision: 18884
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18884&view=rev
Author:   hfriederich
Date:     2007-11-17 06:22:22 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
Add priorization to PInterfaceMonitorClient.
Add protection mechanism against pointers to deleted PSTUNClient instances.
Add method to invalidate PSTUNClient cache.

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/psockbun.h
    ptlib/trunk/include/ptclib/pstun.h
    ptlib/trunk/src/ptclib/psockbun.cxx
    ptlib/trunk/src/ptclib/pstun.cxx

Modified: ptlib/trunk/include/ptclib/psockbun.h
===================================================================
--- ptlib/trunk/include/ptclib/psockbun.h	2007-11-16 11:31:39 UTC (rev 18883)
+++ ptlib/trunk/include/ptclib/psockbun.h	2007-11-17 14:22:22 UTC (rev 18884)
@@ -172,6 +172,8 @@
     void SetInterfaceFilter(PInterfaceFilter * filter);
     
     virtual void RefreshInterfaceList();
+    
+    void OnRemoveSTUNClient(const PSTUNClient *stun);
 
   protected:
     void UpdateThreadMain();
@@ -236,6 +238,12 @@
       const PString & iface,  /// Interface desciptor name
       InterfaceEntry & info   /// Information on the interface
     );
+    
+    /**Returns the priority of this client. A higher value means higher priority.
+       Higher priority clients get their callback functions called first. Clients
+       with the same priority get called in the order of their insertion.
+      */
+    virtual PINDEX GetPriority() const { return 50; }
 
   protected:
     /// Call back function for when an interface has been added to the system
@@ -243,6 +251,9 @@
 
     /// Call back function for when an interface has been removed from the system
     virtual void OnRemoveInterface(const InterfaceEntry & entry) = 0;
+    
+    /// Called when a PSTUNClient is about to be destroyed
+    virtual void OnRemoveSTUNClient(const PSTUNClient *stun) {};
 
   friend class PInterfaceMonitor;
 };
@@ -352,6 +363,7 @@
     );
 
   protected:
+    virtual void OnRemoveSTUNClient(const PSTUNClient *stun);
     struct SocketInfo {
       SocketInfo()
         : socket(NULL)

Modified: ptlib/trunk/include/ptclib/pstun.h
===================================================================
--- ptlib/trunk/include/ptclib/pstun.h	2007-11-16 11:31:39 UTC (rev 18883)
+++ ptlib/trunk/include/ptclib/pstun.h	2007-11-17 14:22:22 UTC (rev 18884)
@@ -251,6 +251,12 @@
       PIPSocket::Address & externalAddress, ///< External address of router
       const PTimeInterval & maxAge = 1000   ///< Maximum age for caching
     );
+    
+    /**Invalidates the cached external address
+       This allows to lazily update the external address cache at the next 
+       attempt to get the external address.
+      */
+    void InvalidateExternalAddressCache();
 
     /**Create a single socket.
        The STUN protocol is used to create a socket for which the external IP

Modified: ptlib/trunk/src/ptclib/psockbun.cxx
===================================================================
--- ptlib/trunk/src/ptclib/psockbun.cxx	2007-11-16 11:31:39 UTC (rev 18883)
+++ ptlib/trunk/src/ptclib/psockbun.cxx	2007-11-17 14:22:22 UTC (rev 18884)
@@ -425,9 +425,18 @@
 {
   PWaitAndSignal m(mutex);
 
-  if (currentClients.empty())
+  if (currentClients.empty()) {
     Start();
-  currentClients.push_back(client);
+    currentClients.push_back(client);
+  } else {
+    for (ClientList_T::iterator iter = currentClients.begin(); iter != currentClients.end(); ++iter) {
+      if ((*iter)->GetPriority() >= client->GetPriority()) {
+        currentClients.insert(iter, client);
+        return;
+      }
+    }
+    currentClients.push_back(client);
+  }
 }
 
 
@@ -446,7 +455,7 @@
 {
   PWaitAndSignal m(mutex);
 
-  for (ClientList_T::iterator iter = currentClients.begin(); iter != currentClients.end(); ++iter) {
+  for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
     PInterfaceMonitorClient * client = *iter;
     if (client->LockReadWrite()) {
       client->OnAddInterface(entry);
@@ -460,7 +469,7 @@
 {
   PWaitAndSignal m(mutex);
 
-  for (ClientList_T::iterator iter = currentClients.begin(); iter != currentClients.end(); ++iter) {
+  for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
     PInterfaceMonitorClient * client = *iter;
     if (client->LockReadWrite()) {
       client->OnRemoveInterface(entry);
@@ -470,6 +479,20 @@
 }
 
 
+void PInterfaceMonitor::OnRemoveSTUNClient(const PSTUNClient *stun)
+{
+  PWaitAndSignal m(mutex);
+  
+  for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
+    PInterfaceMonitorClient *client = *iter;
+    if (client->LockReadWrite()) {
+      client->OnRemoveSTUNClient(stun);
+      client->UnlockReadWrite();
+    }
+  }
+}
+
+
 //////////////////////////////////////////////////
 
 PMonitoredSockets::PMonitoredSockets(BOOL reuseAddr, PSTUNClient * stunClient)
@@ -662,6 +685,13 @@
 }
 
 
+void PMonitoredSockets::OnRemoveSTUNClient(const PSTUNClient *_stun)
+{
+  if (stun == _stun)
+    stun = NULL;
+}
+
+
 //////////////////////////////////////////////////
 
 PMonitoredSocketChannel::PMonitoredSocketChannel(const PMonitoredSocketsPtr & sock, BOOL shared)

Modified: ptlib/trunk/src/ptclib/pstun.cxx
===================================================================
--- ptlib/trunk/src/ptclib/pstun.cxx	2007-11-16 11:31:39 UTC (rev 18883)
+++ ptlib/trunk/src/ptclib/pstun.cxx	2007-11-17 14:22:22 UTC (rev 18884)
@@ -693,6 +693,12 @@
 }
 
 
+void PSTUNClient::InvalidateExternalAddressCache() {
+  cachedExternalAddress = 0;
+  natType = UnknownNat;
+}
+
+
 BOOL PSTUNClient::CreateSocket(PUDPSocket * & socket, const PIPSocket::Address & binding, WORD localPort)
 {
   socket = NULL;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18890] ptlib/trunk

From: <dsandras@us...> - 2007-11-18 20:45

Revision: 18890
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18890&view=rev
Author:   dsandras
Date:     2007-11-18 12:45:22 -0800 (Sun, 18 Nov 2007)

Log Message:
-----------
Applied patch from Matthias Schneider <ma30002000 yahoo de> to fix
compilation with VFW disabled, and to fix several mingw warnings.

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/object.h
    ptlib/trunk/include/ptlib/thread.h
    ptlib/trunk/src/ptlib/common/pglobalstatic.cxx

Modified: ptlib/trunk/include/ptlib/object.h
===================================================================
--- ptlib/trunk/include/ptlib/object.h	2007-11-18 11:05:12 UTC (rev 18889)
+++ ptlib/trunk/include/ptlib/object.h	2007-11-18 20:45:22 UTC (rev 18890)
@@ -1377,8 +1377,8 @@
       { return strcmp(clsName, cls::Class()) == 0 || par::InternalIsDescendant(clsName); } \
     virtual const char * GetClass(unsigned ancestor = 0) const \
       { return ancestor > 0 ? par::GetClass(ancestor-1) : cls::Class(); } \
-    virtual Comparison CompareObjectMemoryDirect(const PObject & obj) const \
-      { return (Comparison)memcmp(this, &obj, sizeof(cls)); } \
+    virtual Comparison CompareObjectMemoryDirect(const PObject & _obj) const \
+      { return (Comparison)memcmp(this, &_obj, sizeof(cls)); } \
     PNEW_AND_DELETE_FUNCTIONS
 
 

Modified: ptlib/trunk/include/ptlib/thread.h
===================================================================
--- ptlib/trunk/include/ptlib/thread.h	2007-11-18 11:05:12 UTC (rev 18889)
+++ ptlib/trunk/include/ptlib/thread.h	2007-11-18 20:45:22 UTC (rev 18890)
@@ -517,7 +517,7 @@
     friend class PProcess;
     // So a PProcess can get at PThread() constructor but nothing else.
 
-    PThread(const PThread &) { }
+    PThread(const PThread &) : PObject () { }
     // Empty constructor to prevent copying of thread instances.
 
     PThread & operator=(const PThread &) { return *this; }
@@ -573,11 +573,11 @@
   PCLASSINFO(PThreadMain, PThread);
   public:
     typedef void (*FnType)(); 
-    PThreadMain(FnType _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn)
+    PThreadMain(FnType _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn)
     { PThread::Resume(); }
-    PThreadMain(const char * _file, int _line, FnType _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread,  NormalPriority,
+    PThreadMain(const char * _file, int _line, FnType _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread,  NormalPriority,
         psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)), fn(_fn)
     { PThread::Resume(); }
     virtual void Main()
@@ -603,12 +603,12 @@
   PCLASSINFO(PThread1Arg, PThread);
   public:
     typedef void (*FnType)(Arg1Type arg1); 
-    PThread1Arg(Arg1Type _arg1, FnType _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn),
+    PThread1Arg(Arg1Type _arg1, FnType _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn),
         arg1(_arg1)
     { PThread::Resume(); }
-    PThread1Arg(const char * _file, int _line, Arg1Type _arg1, FnType _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread,  NormalPriority,
+    PThread1Arg(const char * _file, int _line, Arg1Type _arg1, FnType _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread,  NormalPriority,
         psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)), fn(_fn),
         arg1(_arg1)
     { PThread::Resume(); }
@@ -637,12 +637,12 @@
   PCLASSINFO(PThread2Arg, PThread);
   public:
     typedef void (*FnType)(Arg1Type arg1, Arg2Type arg2); 
-    PThread2Arg(Arg1Type _arg1, Arg2Type _arg2, FnType _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn),
+    PThread2Arg(Arg1Type _arg1, Arg2Type _arg2, FnType _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn),
         arg1(_arg1), arg2(_arg2)
     { PThread::Resume(); }
-    PThread2Arg(const char * _file, int _line, Arg1Type _arg1, Arg2Type _arg2, FnType _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
+    PThread2Arg(const char * _file, int _line, Arg1Type _arg1, Arg2Type _arg2, FnType _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
         psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)), fn(_fn),
         arg1(_arg1), arg2(_arg2)
     { PThread::Resume(); }
@@ -676,12 +676,12 @@
   PCLASSINFO(PThreadObj, PThread);
   public:
     typedef void (ObjType::*ObjTypeFn)(); 
-    PThreadObj(ObjType & _obj, ObjTypeFn _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread),
+    PThreadObj(ObjType & _obj, ObjTypeFn _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread),
         obj(_obj), fn(_fn)
     { PThread::Resume(); }
-    PThreadObj(const char * _file, int _line, ObjType & _obj, ObjTypeFn _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
+    PThreadObj(const char * _file, int _line, ObjType & _obj, ObjTypeFn _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
         psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)),
         obj(_obj), fn(_fn)
     { PThread::Resume(); }
@@ -716,12 +716,12 @@
   PCLASSINFO(PThreadObj1Arg, PThread);
   public:
     typedef void (ObjType::*ObjTypeFn)(Arg1Type); 
-    PThreadObj1Arg(ObjType & _obj, Arg1Type _arg1, ObjTypeFn _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread),
+    PThreadObj1Arg(ObjType & _obj, Arg1Type _arg1, ObjTypeFn _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread),
 				obj(_obj), fn(_fn), arg1(_arg1)
     { PThread::Resume(); }
-    PThreadObj1Arg(const char * _file, int _line, ObjType & _obj, Arg1Type _arg1, ObjTypeFn _fn, BOOL autoDelete = FALSE)
-      : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
+    PThreadObj1Arg(const char * _file, int _line, ObjType & _obj, Arg1Type _arg1, ObjTypeFn _fn, BOOL _autoDelete = FALSE)
+      : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
                                 psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)),
 				obj(_obj), fn(_fn), arg1(_arg1)
     { PThread::Resume(); }

Modified: ptlib/trunk/src/ptlib/common/pglobalstatic.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/pglobalstatic.cxx	2007-11-18 11:05:12 UTC (rev 18889)
+++ ptlib/trunk/src/ptlib/common/pglobalstatic.cxx	2007-11-18 20:45:22 UTC (rev 18890)
@@ -105,9 +105,9 @@
   #include <ptlib/videoio.h>
 
   #if defined(_WIN32) 
-    PWLIB_STATIC_LOAD_PLUGIN(Window, PVideoOutputDevice);
     #if ! defined(NO_VIDEO_CAPTURE)
       #if defined(P_VFW_CAPTURE) 
+        PWLIB_STATIC_LOAD_PLUGIN(Window, PVideoOutputDevice);
         PWLIB_STATIC_LOAD_PLUGIN(VideoForWindows, PVideoInputDevice);
       #endif /*P_VFW_CAPTURE*/
       #if defined(P_DIRECTSHOW) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18891] ptlib/trunk

From: <csoutheren@us...> - 2007-11-18 23:37

Revision: 18891
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18891&view=rev
Author:   csoutheren
Date:     2007-11-18 15:37:11 -0800 (Sun, 18 Nov 2007)

Log Message:
-----------
Allow compilation without DirectX SDK

Modified Paths:
--------------
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in
    ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h
    ptlib/trunk/src/ptlib/msos/sound_directsound.cxx

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2007-11-18 20:45:22 UTC (rev 18890)
+++ ptlib/trunk/configure.ac	2007-11-18 23:37:11 UTC (rev 18891)
@@ -2261,6 +2261,7 @@
 
 dnl MSWIN_DISPLAY    dsound,Direct Sound Support
 dnl MSWIN_CHECK_FILE dsound,include\dsound.h,P_DIRECTSOUND=1
+dnl MSWIN_CHECK_FILE dsound,include\armmacros.s,P_DIRECTSOUND_WINCE=1
 dnl MSWIN_DIR_SYMBOL dsound,DIRECTX_DIR
 dnl MSWIN_FIND_FILE  dsound,P_DIRECTSOUND_LIB64,dsound.lib,lib/x64
 dnl MSWIN_FIND_FILE  dsound,P_DIRECTSOUND_LIB32,dsound.lib,lib/x86

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2007-11-18 20:45:22 UTC (rev 18890)
+++ ptlib/trunk/include/ptbuildopts.h.in	2007-11-18 23:37:11 UTC (rev 18891)
@@ -726,6 +726,7 @@
 //
 // DirectX Support (Windows only)
 //
+#undef P_DIRECTSOUND_WINCE
 
 #ifndef _WIN32_WCE
 #undef P_DIRECTSOUND
@@ -733,7 +734,7 @@
 #undef P_VFW_CAPTURE
 #endif
 
-#if defined(_MSC_VER) && (defined(P_DIRECTSOUND) || defined(P_DIRECTSHOW))
+#if defined(_MSC_VER) && (defined(P_DIRECTSOUND) || defined(P_DIRECTSHOW)) && !defined(P_DIRECTSOUND_WINCE)
 
 #pragma include_alias(<dsound.h>, <@DIRECTX_DIR@...>)
 

Modified: ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h	2007-11-18 20:45:22 UTC (rev 18890)
+++ ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h	2007-11-18 23:37:11 UTC (rev 18891)
@@ -43,7 +43,7 @@
 #include <ptlib.h>
 #include <ptbuildopts.h>
 
-#ifdef P_DIRECTSOUND
+#if defined(P_DIRECTSOUND) && ! defined(P_DIRECTSOUND_WINCE)
 
 #include <ptlib/sound.h>
 

Modified: ptlib/trunk/src/ptlib/msos/sound_directsound.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/sound_directsound.cxx	2007-11-18 20:45:22 UTC (rev 18890)
+++ ptlib/trunk/src/ptlib/msos/sound_directsound.cxx	2007-11-18 23:37:11 UTC (rev 18891)
@@ -49,7 +49,7 @@
 
 #include <ptlib.h>
 
-#ifdef P_DIRECTSOUND
+#if defined(P_DIRECTSOUND) && ! defined(P_DIRECTSOUND_WINCE)
 
 #include <ptlib/msos/ptlib/sound_directsound.h>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18911] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-20 23:08

Revision: 18911
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18911&view=rev
Author:   rjongbloed
Date:     2007-11-20 15:08:23 -0800 (Tue, 20 Nov 2007)

Log Message:
-----------
Added a range to the random number generator to give a better distribution of random numbers across the range rather than the naive approach of just using modulo arithmetic on the 32 bit value.

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/random.h
    ptlib/trunk/samples/ThreadSafe/main.cxx
    ptlib/trunk/samples/dtmftest/main.cxx
    ptlib/trunk/src/ptclib/random.cxx

Modified: ptlib/trunk/include/ptclib/random.h
===================================================================
--- ptlib/trunk/include/ptclib/random.h	2007-11-20 19:39:03 UTC (rev 18910)
+++ ptlib/trunk/include/ptclib/random.h	2007-11-20 23:08:23 UTC (rev 18911)
@@ -107,7 +107,7 @@
        This generates one pseudorandom unsigned integer (32bit) which is
        uniformly distributed among 0 to 2^32-1 for each call.
       */
-    unsigned Generate();
+    unsigned Generate(unsigned maximum = UINT_MAX, unsigned minimum = 0);
 
     /**Get the next psuedo-random number in sequence.
       */

Modified: ptlib/trunk/samples/ThreadSafe/main.cxx
===================================================================
--- ptlib/trunk/samples/ThreadSafe/main.cxx	2007-11-20 19:39:03 UTC (rev 18910)
+++ ptlib/trunk/samples/ThreadSafe/main.cxx	2007-11-20 23:08:23 UTC (rev 18911)
@@ -163,8 +163,9 @@
 
   cout << "Starting " << threadCount << " threads." << endl;
 
+  PRandom random;
   for (PINDEX i = 0; i < threadCount; i++) {
-    PTimeInterval duration = PRandom::Number()%540000 + 60000;
+    PTimeInterval duration = random.Generate(600000, 60000);
     cout << setw(4) << (i + 1) << '=' << duration;
     if (i%5 == 4)
       cout << '\n';

Modified: ptlib/trunk/samples/dtmftest/main.cxx
===================================================================
--- ptlib/trunk/samples/dtmftest/main.cxx	2007-11-20 19:39:03 UTC (rev 18910)
+++ ptlib/trunk/samples/dtmftest/main.cxx	2007-11-20 23:08:23 UTC (rev 18911)
@@ -146,6 +146,7 @@
   cout << "Sample section  is " << milliseconds << " ms long.\n";
 
 
+  PRandom random;
   PShortArray noiseSignal(milliseconds * samplesPerMillisecond);
   if (args.HasOption('n')) {
     unsigned noise = args.GetOptionString('n').AsUnsigned();
@@ -155,7 +156,7 @@
     }
     cout << "Peak noise magnitude is " << noise << '\n';
     for (i = 0; i < noiseSignal.GetSize(); i++)
-      noiseSignal[i] = (short)(PRandom::Number() % noise/2 - noise/2); 
+      noiseSignal[i] = (short)((int)random.Generate(noise/2) - noise/2); 
   }
 
 

Modified: ptlib/trunk/src/ptclib/random.cxx
===================================================================
--- ptlib/trunk/src/ptclib/random.cxx	2007-11-20 19:39:03 UTC (rev 18910)
+++ ptlib/trunk/src/ptclib/random.cxx	2007-11-20 23:08:23 UTC (rev 18911)
@@ -140,32 +140,42 @@
   *(r++) = b = ind(mm,y>>RandBits) + x; \
 }
 
-unsigned PRandom::Generate()
+
+static unsigned redistribute(unsigned value, unsigned maximum, unsigned minimum)
 {
-  if (randcnt--)
-    return randrsl[randcnt];
+  unsigned range = maximum - minimum;
+  while (value > range)
+    value = (value/range) ^ (value%range);
+  return value + minimum;
+}
 
-  register DWORD a,b,x,y,*m,*mm,*m2,*r,*mend;
-  mm=randmem; r=randrsl;
-  a = randa; b = randb + (++randc);
-  for (m = mm, mend = m2 = m+(RandSize/2); m<mend; )
-  {
-    rngstep( a<<13, a, b, mm, m, m2, r, x);
-    rngstep( a>>6 , a, b, mm, m, m2, r, x);
-    rngstep( a<<2 , a, b, mm, m, m2, r, x);
-    rngstep( a>>16, a, b, mm, m, m2, r, x);
+
+unsigned PRandom::Generate(unsigned maximum, unsigned minimum)
+{
+  if (randcnt-- == 0) {
+    register DWORD a,b,x,y,*m,*mm,*m2,*r,*mend;
+    mm=randmem; r=randrsl;
+    a = randa; b = randb + (++randc);
+    for (m = mm, mend = m2 = m+(RandSize/2); m<mend; )
+    {
+      rngstep( a<<13, a, b, mm, m, m2, r, x);
+      rngstep( a>>6 , a, b, mm, m, m2, r, x);
+      rngstep( a<<2 , a, b, mm, m, m2, r, x);
+      rngstep( a>>16, a, b, mm, m, m2, r, x);
+    }
+    for (m2 = mm; m2<mend; )
+    {
+      rngstep( a<<13, a, b, mm, m, m2, r, x);
+      rngstep( a>>6 , a, b, mm, m, m2, r, x);
+      rngstep( a<<2 , a, b, mm, m, m2, r, x);
+      rngstep( a>>16, a, b, mm, m, m2, r, x);
+    }
+    randb = b; randa = a;
+
+    randcnt = RandSize-1;
   }
-  for (m2 = mm; m2<mend; )
-  {
-    rngstep( a<<13, a, b, mm, m, m2, r, x);
-    rngstep( a>>6 , a, b, mm, m, m2, r, x);
-    rngstep( a<<2 , a, b, mm, m, m2, r, x);
-    rngstep( a>>16, a, b, mm, m, m2, r, x);
-  }
-  randb = b; randa = a;
 
-  randcnt = RandSize-1;
-  return randrsl[randcnt];
+  return redistribute(randrsl[randcnt], maximum, minimum);
 }
 
 
@@ -186,7 +196,7 @@
 
 unsigned int PRandom::Number(unsigned int min, unsigned int max)
 {
-  return ((PRandom::Number() % (max - min + 1)) + min);
+  return redistribute(PRandom::Number(), max, min);
 }
 
 // End Of File ///////////////////////////////////////////////////////////////


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18912] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-21 02:24

Revision: 18912
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18912&view=rev
Author:   rjongbloed
Date:     2007-11-20 18:24:20 -0800 (Tue, 20 Nov 2007)

Log Message:
-----------
Random number API change to be more consistent, thanks Derek!

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/random.h
    ptlib/trunk/src/ptclib/random.cxx

Modified: ptlib/trunk/include/ptclib/random.h
===================================================================
--- ptlib/trunk/include/ptclib/random.h	2007-11-20 23:08:23 UTC (rev 18911)
+++ ptlib/trunk/include/ptclib/random.h	2007-11-21 02:24:20 UTC (rev 18912)
@@ -107,10 +107,25 @@
        This generates one pseudorandom unsigned integer (32bit) which is
        uniformly distributed among 0 to 2^32-1 for each call.
       */
-    unsigned Generate(unsigned maximum = UINT_MAX, unsigned minimum = 0);
+    unsigned Generate();
 
     /**Get the next psuedo-random number in sequence.
+       This generates one pseudorandom unsigned integer from 0 to maximum.
+       Uses the Generate() function and scales accordingly.
       */
+    unsigned Generate(unsigned maximum);
+
+    /**Get the next psuedo-random number in sequence.
+       This generates one pseudorandom unsigned integer from minimum to maximum.
+       Uses the Generate() function and scales and shifts accordingly.
+      */
+    unsigned Generate(unsigned minimum, unsigned maximum);
+
+    /**Get the next psuedo-random number in sequence.
+       This generates one pseudorandom unsigned integer which is
+       uniformly distributed among 0 to maximum for each call. Uses
+       Generate()
+      */
     inline operator unsigned() { return Generate(); }
 
 
@@ -120,10 +135,14 @@
       */
     static unsigned Number();
 
-    /** Get a random number between min and max
+    /** Get a random number between zero and maximum
     */
-    static unsigned int Number(unsigned int min, unsigned int max);
+    static unsigned Number(unsigned maximum);
 
+    /** Get a random number between minimum and maximum
+    */
+    static unsigned Number(unsigned minimum, unsigned maximum);
+
   protected:
     enum {
       RandBits = 8, ///< I recommend 8 for crypto, 4 for simulations

Modified: ptlib/trunk/src/ptclib/random.cxx
===================================================================
--- ptlib/trunk/src/ptclib/random.cxx	2007-11-20 23:08:23 UTC (rev 18911)
+++ ptlib/trunk/src/ptclib/random.cxx	2007-11-21 02:24:20 UTC (rev 18912)
@@ -141,7 +141,7 @@
 }
 
 
-static unsigned redistribute(unsigned value, unsigned maximum, unsigned minimum)
+static unsigned redistribute(unsigned value, unsigned minimum, unsigned maximum)
 {
   unsigned range = maximum - minimum;
   while (value > range)
@@ -150,7 +150,7 @@
 }
 
 
-unsigned PRandom::Generate(unsigned maximum, unsigned minimum)
+unsigned PRandom::Generate()
 {
   if (randcnt-- == 0) {
     register DWORD a,b,x,y,*m,*mm,*m2,*r,*mend;
@@ -175,10 +175,22 @@
     randcnt = RandSize-1;
   }
 
-  return redistribute(randrsl[randcnt], maximum, minimum);
+  return randrsl[randcnt];
 }
 
 
+unsigned PRandom::Generate(unsigned maximum)
+{
+  return redistribute(Generate(), 0, maximum);
+}
+
+
+unsigned PRandom::Generate(unsigned minimum, unsigned maximum)
+{
+  return redistribute(Generate(), minimum, maximum);
+}
+
+
 #ifdef P_RTEMS
 static PMutex mutex;
 #endif
@@ -194,9 +206,16 @@
   return rand;
 }
 
-unsigned int PRandom::Number(unsigned int min, unsigned int max)
+unsigned int PRandom::Number(unsigned maximum)
 {
-  return redistribute(PRandom::Number(), max, min);
+  return redistribute(Number(), 0, maximum);
 }
 
+
+unsigned int PRandom::Number(unsigned minimum, unsigned maximum)
+{
+  return redistribute(Number(), minimum, maximum);
+}
+
+
 // End Of File ///////////////////////////////////////////////////////////////


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18923] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-21 22:58

Revision: 18923
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18923&view=rev
Author:   rjongbloed
Date:     2007-11-21 14:58:14 -0800 (Wed, 21 Nov 2007)

Log Message:
-----------
Renamed old DevStudio 2003 solution files so don't keep selecting them by accident when have 2005 installed.

Added Paths:
-----------
    ptlib/trunk/ptlib_2003.sln
    ptlib/trunk/ptlib_samples_2003.sln
    ptlib/trunk/samples/ODBC/odbctest_2003.sln
    ptlib/trunk/tools/asnparser/asnparser_2003.sln

Removed Paths:
-------------
    ptlib/trunk/ptlib.sln
    ptlib/trunk/ptlib_samples.sln
    ptlib/trunk/samples/ODBC/odbctest.sln
    ptlib/trunk/tools/asnparser/asnparser.sln

Deleted: ptlib/trunk/ptlib.sln
===================================================================
--- ptlib/trunk/ptlib.sln	2007-11-21 22:46:57 UTC (rev 18922)
+++ ptlib/trunk/ptlib.sln	2007-11-21 22:58:14 UTC (rev 18923)
@@ -1,70 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World", "samples\hello_world\hello.vcproj", "{D38CA533-D522-4D9E-B2C9-D59F6C415268}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib Static", "src\ptlib\msos\Console.vcproj", "{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib DLL", "src\ptlib\msos\PTLib.vcproj", "{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeSym", "tools\MergeSym\MergeSym.vcproj", "{F34BE504-015A-42E6-9342-3800EAD5F561}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "tools\configure\configure.vcproj", "{9C8D0100-6709-4628-9993-69F443AF69E8}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paec", "src\ptclib\speex_echo\PAEC.vcproj", "{6316EB4E-0F57-4491-9383-22072AF3D996}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Pseudo-Debug = Pseudo-Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.ActiveCfg = Debug|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.Build.0 = Debug|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Pseudo-Debug.ActiveCfg = Debug|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.ActiveCfg = Release|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.Build.0 = Release|Win32
-		{F34BE504-015A-42E6-9342-3800EAD5F561}.Debug.ActiveCfg = Debug|Win32
-		{F34BE504-015A-42E6-9342-3800EAD5F561}.Pseudo-Debug.ActiveCfg = Debug|Win32
-		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release.ActiveCfg = Release|Win32
-		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release.Build.0 = Release|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.ActiveCfg = Debug|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.Build.0 = Debug|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Pseudo-Debug.ActiveCfg = Debug|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.ActiveCfg = Release|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.Build.0 = Release|Win32
-		{9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.ActiveCfg = Debug|Win32
-		{9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.Build.0 = Debug|Win32
-		{9C8D0100-6709-4628-9993-69F443AF69E8}.Pseudo-Debug.ActiveCfg = Debug|Win32
-		{9C8D0100-6709-4628-9993-69F443AF69E8}.Pseudo-Debug.Build.0 = Debug|Win32
-		{9C8D0100-6709-4628-9993-69F443AF69E8}.Release.ActiveCfg = Release|Win32
-		{9C8D0100-6709-4628-9993-69F443AF69E8}.Release.Build.0 = Release|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.ActiveCfg = Debug|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.Build.0 = Debug|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Pseudo-Debug.ActiveCfg = Debug|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Pseudo-Debug.Build.0 = Debug|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release.ActiveCfg = Release|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release.Build.0 = Release|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.ActiveCfg = Debug|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.Build.0 = Debug|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Pseudo-Debug.ActiveCfg = Debug|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Pseudo-Debug.Build.0 = Debug|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.ActiveCfg = Release|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal

Copied: ptlib/trunk/ptlib_2003.sln (from rev 18922, ptlib/trunk/ptlib.sln)
===================================================================
--- ptlib/trunk/ptlib_2003.sln	                        (rev 0)
+++ ptlib/trunk/ptlib_2003.sln	2007-11-21 22:58:14 UTC (rev 18923)
@@ -0,0 +1,70 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World", "samples\hello_world\hello.vcproj", "{D38CA533-D522-4D9E-B2C9-D59F6C415268}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib Static", "src\ptlib\msos\Console.vcproj", "{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib DLL", "src\ptlib\msos\PTLib.vcproj", "{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeSym", "tools\MergeSym\MergeSym.vcproj", "{F34BE504-015A-42E6-9342-3800EAD5F561}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "tools\configure\configure.vcproj", "{9C8D0100-6709-4628-9993-69F443AF69E8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paec", "src\ptclib\speex_echo\PAEC.vcproj", "{6316EB4E-0F57-4491-9383-22072AF3D996}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Pseudo-Debug = Pseudo-Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.ActiveCfg = Debug|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.Build.0 = Debug|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Pseudo-Debug.ActiveCfg = Debug|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.ActiveCfg = Release|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.Build.0 = Release|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Debug.ActiveCfg = Debug|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Pseudo-Debug.ActiveCfg = Debug|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release.ActiveCfg = Release|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release.Build.0 = Release|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.ActiveCfg = Debug|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.Build.0 = Debug|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Pseudo-Debug.ActiveCfg = Debug|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.ActiveCfg = Release|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.Build.0 = Release|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.ActiveCfg = Debug|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.Build.0 = Debug|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Pseudo-Debug.ActiveCfg = Debug|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Pseudo-Debug.Build.0 = Debug|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Release.ActiveCfg = Release|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Release.Build.0 = Release|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.ActiveCfg = Debug|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.Build.0 = Debug|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Pseudo-Debug.ActiveCfg = Debug|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Pseudo-Debug.Build.0 = Debug|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release.ActiveCfg = Release|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release.Build.0 = Release|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.ActiveCfg = Debug|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.Build.0 = Debug|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Pseudo-Debug.ActiveCfg = Debug|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Pseudo-Debug.Build.0 = Debug|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.ActiveCfg = Release|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

Deleted: ptlib/trunk/ptlib_samples.sln
===================================================================
--- ptlib/trunk/ptlib_samples.sln	2007-11-21 22:46:57 UTC (rev 18922)
+++ ptlib/trunk/ptlib_samples.sln	2007-11-21 22:58:14 UTC (rev 18923)
@@ -1,308 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World Static", "samples\hello_world\hello.vcproj", "{D38CA533-D522-4D9E-B2C9-D59F6C415268}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib Static", "src\ptlib\msos\Console.vcproj", "{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib DLL", "src\ptlib\msos\PTLib.vcproj", "{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeSym", "tools\MergeSym\MergeSym.vcproj", "{F34BE504-015A-42E6-9342-3800EAD5F561}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "tools\configure\configure.vcproj", "{9C8D0100-6709-4628-9993-69F443AF69E8}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paec", "src\ptclib\speex_echo\PAEC.vcproj", "{6316EB4E-0F57-4491-9383-22072AF3D996}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "samples\xmlrpc\xmlrpc.vcproj", "{435616F1-7BA5-4DF5-9108-879BE511F5A1}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stunclient", "samples\stunclient\stunclient.vcproj", "{D0C00ADD-544B-4922-AB52-14415894D684}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpptest", "samples\xmpptest\xmpptest.vcproj", "{D2A0F886-B231-4CD6-A959-3FB1626C1662}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timing", "samples\timing\timing.vcproj", "{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vxmltest", "samples\vxmltest\vxmltest.vcproj", "{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThreadSafe", "samples\ThreadSafe\ThreadSafe.vcproj", "{7AB210A3-FB94-473A-93A5-7CEE149B136C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipv6test", "samples\ipv6test\ipv6test.vcproj", "{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnstest", "samples\dnstest\dnstest.vcproj", "{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emailtest", "samples\emailtest\emailtest.vcproj", "{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vidtest", "samples\vidtest\vidtest.vcproj", "{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aggtest", "samples\aggtest\aggtest.vcproj", "{0BF651AA-894B-49F3-9B60-24BFFBFC004C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtmftest", "samples\dtmftest\dtmftest.vcproj", "{F057363D-AFD2-4DC4-9C44-57B714C27162}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "factory", "samples\factory\factory.vcproj", "{2C44F783-CA2A-44A5-A463-CC7956BE00A7}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "find_ip", "samples\find_ip\find_ip.vcproj", "{46D2EA84-33A6-4249-B9ED-779065478CA6}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ldaptest", "samples\ldaptest\ldaptest.vcproj", "{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptimer", "samples\ptimer\ptimer.vcproj", "{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PxmlTest", "samples\pxml\PxmlTest.vcproj", "{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "safetest", "samples\safetest\safetest.vcproj", "{D0C00ADD-544B-4922-AB52-14415894D684}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SortedListTest", "samples\sortedlist\SortedListTest.vcproj", "{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadex", "samples\threadex\threadex.vcproj", "{89F7154A-47E5-47FE-88E3-E5E8EC516752}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wavfile", "samples\wavfile\wavfile.vcproj", "{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpcsrvr", "samples\xmlrpcsrvr\xmlrpcsrvr.vcproj", "{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World DLL", "samples\hello_world\helloDLL_2003.vcproj", "{3B071642-5CE4-4B49-AFE8-8D475DF14F49}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockbundle", "samples\sockbundle\sockbundle_2003.vcproj", "{3F866477-F1AA-4EB8-A399-B7971CF49747}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		No Trace = No Trace
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.ActiveCfg = Debug|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.Build.0 = Debug|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace.ActiveCfg = No Trace|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace.Build.0 = No Trace|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.ActiveCfg = Release|Win32
-		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.Build.0 = Release|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.ActiveCfg = Debug|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.Build.0 = Debug|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.No Trace.ActiveCfg = No Trace|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.No Trace.Build.0 = No Trace|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.ActiveCfg = Release|Win32
-		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.Build.0 = Release|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.ActiveCfg = Debug|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.Build.0 = Debug|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace.ActiveCfg = No Trace|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace.Build.0 = No Trace|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.ActiveCfg = Release|Win32
-		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.Build.0 = Release|Win32
-		{F34BE504-015A-42E6-9342-3800EAD5F561}.Debug.ActiveCfg = Debug|Win32
-		{F34BE504-015A-42E6-9342-3800EAD5F561}.No Trace.ActiveCfg = No Trace|Win32
-		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release.ActiveCfg = Release|Win32
-		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release.Build.0 = Release|Win32
-		{9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.ActiveCfg = Debug|Win32
-		{9C8D0100-6709-4628-9993-69F443AF69E8}.No Trace.ActiveCfg = No Trace|Win32
-		{9C8D0100-6709-4628-9993-69F443AF69E8}.Release.ActiveCfg = Release|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.ActiveCfg = Debug|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.Build.0 = Debug|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace.ActiveCfg = No Trace|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace.Build.0 = No Trace|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release.ActiveCfg = Release|Win32
-		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release.Build.0 = Release|Win32
-		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug.ActiveCfg = Debug|Win32
-		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug.Build.0 = Debug|Win32
-		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.No Trace.ActiveCfg = No Trace|Win32
-		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release.ActiveCfg = Release|Win32
-		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release.Build.0 = Release|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug.ActiveCfg = Debug|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug.Build.0 = Debug|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.ActiveCfg = No Trace|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.Build.0 = No Trace|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.Release.ActiveCfg = Release|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.Release.Build.0 = Release|Win32
-		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug.ActiveCfg = Debug|Win32
-		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug.Build.0 = Debug|Win32
-		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace.ActiveCfg = No Trace|Win32
-		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace.Build.0 = No Trace|Win32
-		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release.ActiveCfg = Release|Win32
-		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release.Build.0 = Release|Win32
-		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug.ActiveCfg = Debug|Win32
-		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug.Build.0 = Debug|Win32
-		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace.ActiveCfg = No Trace|Win32
-		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace.Build.0 = No Trace|Win32
-		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release.ActiveCfg = Release|Win32
-		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release.Build.0 = Release|Win32
-		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug.ActiveCfg = Debug|Win32
-		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug.Build.0 = Debug|Win32
-		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace.ActiveCfg = No Trace|Win32
-		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace.Build.0 = No Trace|Win32
-		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release.ActiveCfg = Release|Win32
-		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release.Build.0 = Release|Win32
-		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug.ActiveCfg = Debug|Win32
-		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug.Build.0 = Debug|Win32
-		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace.ActiveCfg = No Trace|Win32
-		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace.Build.0 = No Trace|Win32
-		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release.ActiveCfg = Release|Win32
-		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release.Build.0 = Release|Win32
-		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug.ActiveCfg = Debug|Win32
-		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug.Build.0 = Debug|Win32
-		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace.ActiveCfg = No Trace|Win32
-		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace.Build.0 = No Trace|Win32
-		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release.ActiveCfg = Release|Win32
-		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release.Build.0 = Release|Win32
-		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug.ActiveCfg = Debug|Win32
-		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug.Build.0 = Debug|Win32
-		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace.ActiveCfg = No Trace|Win32
-		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace.Build.0 = No Trace|Win32
-		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release.ActiveCfg = Release|Win32
-		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release.Build.0 = Release|Win32
-		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug.ActiveCfg = Debug|Win32
-		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug.Build.0 = Debug|Win32
-		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace.ActiveCfg = No Trace|Win32
-		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace.Build.0 = No Trace|Win32
-		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release.ActiveCfg = Release|Win32
-		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release.Build.0 = Release|Win32
-		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug.ActiveCfg = Debug|Win32
-		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug.Build.0 = Debug|Win32
-		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace.ActiveCfg = No Trace|Win32
-		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace.Build.0 = No Trace|Win32
-		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release.ActiveCfg = Release|Win32
-		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release.Build.0 = Release|Win32
-		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug.ActiveCfg = Debug|Win32
-		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug.Build.0 = Debug|Win32
-		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace.ActiveCfg = No Trace|Win32
-		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace.Build.0 = No Trace|Win32
-		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release.ActiveCfg = Release|Win32
-		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release.Build.0 = Release|Win32
-		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug.ActiveCfg = Debug|Win32
-		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug.Build.0 = Debug|Win32
-		{F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace.ActiveCfg = No Trace|Win32
-		{F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace.Build.0 = No Trace|Win32
-		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Release.ActiveCfg = Release|Win32
-		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Release.Build.0 = Release|Win32
-		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug.ActiveCfg = Debug|Win32
-		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug.Build.0 = Debug|Win32
-		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace.ActiveCfg = No Trace|Win32
-		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace.Build.0 = No Trace|Win32
-		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release.ActiveCfg = Release|Win32
-		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release.Build.0 = Release|Win32
-		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug.ActiveCfg = Debug|Win32
-		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug.Build.0 = Debug|Win32
-		{46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace.ActiveCfg = No Trace|Win32
-		{46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace.Build.0 = No Trace|Win32
-		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Release.ActiveCfg = Release|Win32
-		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Release.Build.0 = Release|Win32
-		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug.ActiveCfg = Debug|Win32
-		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug.Build.0 = Debug|Win32
-		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace.ActiveCfg = No Trace|Win32
-		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace.Build.0 = No Trace|Win32
-		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release.ActiveCfg = Release|Win32
-		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release.Build.0 = Release|Win32
-		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug.ActiveCfg = Debug|Win32
-		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug.Build.0 = Debug|Win32
-		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace.ActiveCfg = No Trace|Win32
-		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace.Build.0 = No Trace|Win32
-		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release.ActiveCfg = Release|Win32
-		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release.Build.0 = Release|Win32
-		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug.ActiveCfg = Debug|Win32
-		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug.Build.0 = Debug|Win32
-		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace.ActiveCfg = No Trace|Win32
-		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace.Build.0 = No Trace|Win32
-		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release.ActiveCfg = Release|Win32
-		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release.Build.0 = Release|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug.ActiveCfg = Debug|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug.Build.0 = Debug|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.ActiveCfg = No Trace|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.Build.0 = No Trace|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.Release.ActiveCfg = Release|Win32
-		{D0C00ADD-544B-4922-AB52-14415894D684}.Release.Build.0 = Release|Win32
-		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug.ActiveCfg = Debug|Win32
-		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug.Build.0 = Debug|Win32
-		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace.ActiveCfg = No Trace|Win32
-		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace.Build.0 = No Trace|Win32
-		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release.ActiveCfg = Release|Win32
-		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release.Build.0 = Release|Win32
-		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug.ActiveCfg = Debug|Win32
-		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug.Build.0 = Debug|Win32
-		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace.ActiveCfg = No Trace|Win32
-		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace.Build.0 = No Trace|Win32
-		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release.ActiveCfg = Release|Win32
-		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release.Build.0 = Release|Win32
-		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug.ActiveCfg = Debug|Win32
-		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug.Build.0 = Debug|Win32
-		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace.ActiveCfg = No Trace|Win32
-		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace.Build.0 = No Trace|Win32
-		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release.ActiveCfg = Release|Win32
-		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release.Build.0 = Release|Win32
-		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug.ActiveCfg = Debug|Win32
-		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug.Build.0 = Debug|Win32
-		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace.ActiveCfg = No Trace|Win32
-		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace.Build.0 = No Trace|Win32
-		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release.ActiveCfg = Release|Win32
-		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release.Build.0 = Release|Win32
-		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Debug.ActiveCfg = Debug|Win32
-		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Debug.Build.0 = Debug|Win32
-		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.No Trace.ActiveCfg = No Trace|Win32
-		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.No Trace.Build.0 = No Trace|Win32
-		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Release.ActiveCfg = Release|Win32
-		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Release.Build.0 = Release|Win32
-		{3F866477-F1AA-4EB8-A399-B7971CF49747}.Debug.ActiveCfg = Debug|Win32
-		{3F866477-F1AA-4EB8-A399-B7971CF49747}.Debug.Build.0 = Debug|Win32
-		{3F866477-F1AA-4EB8-A399-B7971CF49747}.No Trace.ActiveCfg = No Trace|Win32
-		{3F866477-F1AA-4EB8-A399-B7971CF49747}.No Trace.Build.0 = No Trace|Win32
-		{3F866477-F1AA-4EB8-A399-B7971CF49747}.Release.ActiveCfg = Release|Win32
-		{3F866477-F1AA-4EB8-A399-B7971CF49747}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal

Copied: ptlib/trunk/ptlib_samples_2003.sln (from rev 18922, ptlib/trunk/ptlib_samples.sln)
===================================================================
--- ptlib/trunk/ptlib_samples_2003.sln	                        (rev 0)
+++ ptlib/trunk/ptlib_samples_2003.sln	2007-11-21 22:58:14 UTC (rev 18923)
@@ -0,0 +1,308 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World Static", "samples\hello_world\hello.vcproj", "{D38CA533-D522-4D9E-B2C9-D59F6C415268}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib Static", "src\ptlib\msos\Console.vcproj", "{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib DLL", "src\ptlib\msos\PTLib.vcproj", "{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeSym", "tools\MergeSym\MergeSym.vcproj", "{F34BE504-015A-42E6-9342-3800EAD5F561}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "tools\configure\configure.vcproj", "{9C8D0100-6709-4628-9993-69F443AF69E8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paec", "src\ptclib\speex_echo\PAEC.vcproj", "{6316EB4E-0F57-4491-9383-22072AF3D996}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "samples\xmlrpc\xmlrpc.vcproj", "{435616F1-7BA5-4DF5-9108-879BE511F5A1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stunclient", "samples\stunclient\stunclient.vcproj", "{D0C00ADD-544B-4922-AB52-14415894D684}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpptest", "samples\xmpptest\xmpptest.vcproj", "{D2A0F886-B231-4CD6-A959-3FB1626C1662}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timing", "samples\timing\timing.vcproj", "{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vxmltest", "samples\vxmltest\vxmltest.vcproj", "{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThreadSafe", "samples\ThreadSafe\ThreadSafe.vcproj", "{7AB210A3-FB94-473A-93A5-7CEE149B136C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipv6test", "samples\ipv6test\ipv6test.vcproj", "{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnstest", "samples\dnstest\dnstest.vcproj", "{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emailtest", "samples\emailtest\emailtest.vcproj", "{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vidtest", "samples\vidtest\vidtest.vcproj", "{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aggtest", "samples\aggtest\aggtest.vcproj", "{0BF651AA-894B-49F3-9B60-24BFFBFC004C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtmftest", "samples\dtmftest\dtmftest.vcproj", "{F057363D-AFD2-4DC4-9C44-57B714C27162}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "factory", "samples\factory\factory.vcproj", "{2C44F783-CA2A-44A5-A463-CC7956BE00A7}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "find_ip", "samples\find_ip\find_ip.vcproj", "{46D2EA84-33A6-4249-B9ED-779065478CA6}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ldaptest", "samples\ldaptest\ldaptest.vcproj", "{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptimer", "samples\ptimer\ptimer.vcproj", "{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PxmlTest", "samples\pxml\PxmlTest.vcproj", "{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "safetest", "samples\safetest\safetest.vcproj", "{D0C00ADD-544B-4922-AB52-14415894D684}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SortedListTest", "samples\sortedlist\SortedListTest.vcproj", "{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadex", "samples\threadex\threadex.vcproj", "{89F7154A-47E5-47FE-88E3-E5E8EC516752}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wavfile", "samples\wavfile\wavfile.vcproj", "{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpcsrvr", "samples\xmlrpcsrvr\xmlrpcsrvr.vcproj", "{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World DLL", "samples\hello_world\helloDLL_2003.vcproj", "{3B071642-5CE4-4B49-AFE8-8D475DF14F49}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockbundle", "samples\sockbundle\sockbundle_2003.vcproj", "{3F866477-F1AA-4EB8-A399-B7971CF49747}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		No Trace = No Trace
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.ActiveCfg = Debug|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.Build.0 = Debug|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace.ActiveCfg = No Trace|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace.Build.0 = No Trace|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.ActiveCfg = Release|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.Build.0 = Release|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.ActiveCfg = Debug|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.Build.0 = Debug|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.No Trace.ActiveCfg = No Trace|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.No Trace.Build.0 = No Trace|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.ActiveCfg = Release|Win32
+		{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.Build.0 = Release|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.ActiveCfg = Debug|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.Build.0 = Debug|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace.ActiveCfg = No Trace|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace.Build.0 = No Trace|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.ActiveCfg = Release|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.Build.0 = Release|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Debug.ActiveCfg = Debug|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.No Trace.ActiveCfg = No Trace|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release.ActiveCfg = Release|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release.Build.0 = Release|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.ActiveCfg = Debug|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.No Trace.ActiveCfg = No Trace|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Release.ActiveCfg = Release|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.ActiveCfg = Debug|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.Build.0 = Debug|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace.ActiveCfg = No Trace|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace.Build.0 = No Trace|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release.ActiveCfg = Release|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release.Build.0 = Release|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug.ActiveCfg = Debug|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug.Build.0 = Debug|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.No Trace.ActiveCfg = No Trace|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release.ActiveCfg = Release|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release.Build.0 = Release|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug.ActiveCfg = Debug|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug.Build.0 = Debug|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.ActiveCfg = No Trace|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.Build.0 = No Trace|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Release.ActiveCfg = Release|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Release.Build.0 = Release|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug.ActiveCfg = Debug|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug.Build.0 = Debug|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace.ActiveCfg = No Trace|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace.Build.0 = No Trace|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release.ActiveCfg = Release|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release.Build.0 = Release|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug.ActiveCfg = Debug|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug.Build.0 = Debug|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace.ActiveCfg = No Trace|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace.Build.0 = No Trace|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release.ActiveCfg = Release|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release.Build.0 = Release|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug.ActiveCfg = Debug|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug.Build.0 = Debug|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace.ActiveCfg = No Trace|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace.Build.0 = No Trace|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release.ActiveCfg = Release|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release.Build.0 = Release|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug.ActiveCfg = Debug|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug.Build.0 = Debug|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace.ActiveCfg = No Trace|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace.Build.0 = No Trace|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release.ActiveCfg = Release|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release.Build.0 = Release|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug.ActiveCfg = Debug|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug.Build.0 = Debug|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace.ActiveCfg = No Trace|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace.Build.0 = No Trace|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release.ActiveCfg = Release|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release.Build.0 = Release|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug.ActiveCfg = Debug|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug.Build.0 = Debug|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace.ActiveCfg = No Trace|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace.Build.0 = No Trace|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release.ActiveCfg = Release|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release.Build.0 = Release|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug.ActiveCfg = Debug|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug.Build.0 = Debug|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace.ActiveCfg = No Trace|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace.Build.0 = No Trace|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release.ActiveCfg = Release|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release.Build.0 = Release|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug.ActiveCfg = Debug|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug.Build.0 = Debug|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace.ActiveCfg = No Trace|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace.Build.0 = No Trace|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release.ActiveCfg = Release|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release.Build.0 = Release|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug.ActiveCfg = Debug|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug.Build.0 = Debug|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace.ActiveCfg = No Trace|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace.Build.0 = No Trace|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release.ActiveCfg = Release|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release.Build.0 = Release|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug.ActiveCfg = Debug|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug.Build.0 = Debug|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace.ActiveCfg = No Trace|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace.Build.0 = No Trace|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Release.ActiveCfg = Release|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Release.Build.0 = Release|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug.ActiveCfg = Debug|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug.Build.0 = Debug|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace.ActiveCfg = No Trace|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace.Build.0 = No Trace|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release.ActiveCfg = Release|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release.Build.0 = Release|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug.ActiveCfg = Debug|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug.Build.0 = Debug|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace.ActiveCfg = No Trace|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace.Build.0 = No Trace|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Release.ActiveCfg = Release|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Release.Build.0 = Release|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug.ActiveCfg = Debug|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug.Build.0 = Debug|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace.ActiveCfg = No Trace|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace.Build.0 = No Trace|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release.ActiveCfg = Release|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release.Build.0 = Release|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug.ActiveCfg = Debug|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug.Build.0 = Debug|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace.ActiveCfg = No Trace|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace.Build.0 = No Trace|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release.ActiveCfg = Release|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release.Build.0 = Release|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug.ActiveCfg = Debug|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug.Build.0 = Debug|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace.ActiveCfg = No Trace|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace.Build.0 = No Trace|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release.ActiveCfg = Release|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release.Build.0 = Release|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug.ActiveCfg = Debug|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug.Build.0 = Debug|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.ActiveCfg = No Trace|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.Build.0 = No Trace|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Release.ActiveCfg = Release|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Release.Build.0 = Release|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug.ActiveCfg = Debug|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug.Build.0 = Debug|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace.ActiveCfg = No Trace|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace.Build.0 = No Trace|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release.ActiveCfg = Release|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release.Build.0 = Release|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug.ActiveCfg = Debug|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug.Build.0 = Debug|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace.ActiveCfg = No Trace|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace.Build.0 = No Trace|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release.ActiveCfg = Release|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release.Build.0 = Release|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug.ActiveCfg = Debug|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug.Build.0 = Debug|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace.ActiveCfg = No Trace|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace.Build.0 = No Trace|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release.ActiveCfg = Release|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release.Build.0 = Release|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug.ActiveCfg = Debug|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug.Build.0 = Debug|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace.ActiveCfg = No Trace|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace.Build.0 = No Trace|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release.ActiveCfg = Release|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release.Build.0 = Release|Win32
+		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Debug.ActiveCfg = Debug|Win32
+		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Debug.Build.0 = Debug|Win32
+		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.No Trace.ActiveCfg = No Trace|Win32
+		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.No Trace.Build.0 = No Trace|Win32
+		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Release.ActiveCfg = Release|Win32
+		{3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Release.Build.0 = Release|Win32
+		{3F866477-F1AA-4EB8-A399-B7971CF49747}.Debug.ActiveCfg = Debug|Win32
+		{3F866477-F1AA-4EB8-A399-B7971CF49747}.Debug.Build.0 = Debug|Win32
+		{3F866477-F1AA-4EB8-A399-B7971CF49747}.No Trace.ActiveCfg = No Trace|Win32
+		{3F866477-F1AA-4EB8-A399-B7971CF49747}.No Trace.Build.0 = No Trace|Win32
+		{3F866477-F1AA-4EB8-A399-B7971CF49747}.Release.ActiveCfg = Release|Win32
+		{3F866477-F1AA-4EB8-A399-B7971CF49747}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

Deleted: ptlib/trunk/samples/ODBC/odbctest.sln
===================================================================
--- ptlib/trunk/samples/ODBC/odbctest.sln	2007-11-21 22:46:57 UTC (rev 18922)
+++ ptlib/trunk/samples/ODBC/odbctest.sln	2007-11-21 22:58:14 UTC (rev 18923)
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbctest", "odbctest.vcproj", "{2F2988EA-3584-4733-BC1A-58732C0BC917}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{2F2988EA-3584-4733-BC1A-58732C0BC917}.Debug.ActiveCfg = Debug|Win32
-		{2F2988EA-3584-4733-BC1A-58732C0BC917}.Debug.Build.0 = Debug|Win32
-		{2F2988EA-3584-4733-BC1A-58732C0BC917}.Release.ActiveCfg = Release|Win32
-		{2F2988EA-3584-4733-BC1A-58732C0BC917}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal

Copied: ptlib/trunk/samples/ODBC/odbctest_2003.sln (from rev 18922, ptlib/trunk/samples/ODBC/odbctest.sln)
===================================================================
--- ptlib/trunk/samples/ODBC/odbctest_2003.sln	                        (rev 0)
+++ ptlib/trunk/samples/ODBC/odbctest_2003.sln	2007-11-21 22:58:14 UTC (rev 18923)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbctest", "odbctest.vcproj", "{2F2988EA-3584-4733-BC1A-58732C0BC917}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{2F2988EA-3584-4733-BC1A-58732C0BC917}.Debug.ActiveCfg = Debug|Win32
+		{2F2988EA-3584-4733-BC1A-58732C0BC917}.Debug.Build.0 = Debug|Win32
+		{2F2988EA-3584-4733-BC1A-58732C0BC917}.Release.ActiveCfg = Release|Win32
+		{2F2988EA-3584-4733-BC1A-58732C0BC917}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

Deleted: ptlib/trunk/tools/asnparser/asnparser.sln
===================================================================
--- ptlib/trunk/tools/asnparser/asnparser.sln	2007-11-21 22:46:57 UTC (rev 18922)
+++ ptlib/trunk/tools/asnparser/asnparser.sln	2007-11-21 22:58:14 UTC (rev 18923)
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASNParser", "asnparser.vcproj", "{7D4C9E74-F196-4A30-859F-62748657B86B}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{7D4C9E74-F196-4A30-859F-62748657B86B}.Debug.ActiveCfg = Debug|Win32
-		{7D4C9E74-F196-4A30-859F-62748657B86B}.Debug.Build.0 = Debug|Win32
-		{7D4C9E74-F196-4A30-859F-62748657B86B}.Release.ActiveCfg = Release|Win32
-		{7D4C9E74-F196-4A30-859F-62748657B86B}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal

Copied: ptlib/trunk/tools/asnparser/asnparser_2003.sln (from rev 18922, ptlib/trunk/tools/asnparser/asnparser.sln)
===================================================================
--- ptlib/trunk/tools/asnparser/asnparser_2003.sln	                        (rev 0)
+++ ptlib/trunk/tools/asnparser/asnparser_2003.sln	2007-11-21 22:58:14 UTC (rev 18923)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASNParser", "asnparser.vcproj", "{7D4C9E74-F196-4A30-859F-62748657B86B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{7D4C9E74-F196-4A30-859F-62748657B86B}.Debug.ActiveCfg = Debug|Win32
+		{7D4C9E74-F196-4A30-859F-62748657B86B}.Debug.Build.0 = Debug|Win32
+		{7D4C9E74-F196-4A30-859F-62748657B86B}.Release.ActiveCfg = Release|Win32
+		{7D4C9E74-F196-4A30-859F-62748657B86B}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18939] ptlib/trunk

From: <hfriederich@us...> - 2007-11-24 09:55

Revision: 18939
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18939&view=rev
Author:   hfriederich
Date:     2007-11-24 01:55:14 -0800 (Sat, 24 Nov 2007)

Log Message:
-----------
Fix problems with weird c++ class casts within constructors.
Change interface update callback sequence to do all interface
  changes on one interface monitor client before changing the
  next one.
Add new method for comparing interfaces.

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/psockbun.h
    ptlib/trunk/src/ptclib/psockbun.cxx

Modified: ptlib/trunk/include/ptclib/psockbun.h
===================================================================
--- ptlib/trunk/include/ptclib/psockbun.h	2007-11-24 04:33:26 UTC (rev 18938)
+++ ptlib/trunk/include/ptclib/psockbun.h	2007-11-24 09:55:14 UTC (rev 18939)
@@ -111,6 +111,15 @@
       InterfaceEntry & info   /// Information on the interface
     );
     
+    /** Returns whether the descriptor string equals the interface entry.
+        Note that when searching the descriptor may be a partial match
+        e.g. "10.0.1.11" or "%eth0" may be used.
+      */
+    static BOOL IsMatchingInterface(
+      const PString & iface,        /// Interface descriptor
+      const InterfaceEntry & entry  /// Interface entry
+    );
+    
     /** Sets the monitor's interface filter. Note that the monitor instance
         handles deletion of the filter.
       */
@@ -125,11 +134,9 @@
 
     void AddClient(PInterfaceMonitorClient *);
     void RemoveClient(PInterfaceMonitorClient *);
+    
+    virtual void OnInterfacesChanged(const PIPSocket::InterfaceTable & addedInterfaces, const PIPSocket::InterfaceTable & removedInterfaces);
 
-    virtual void OnAddInterface(const InterfaceEntry & entry);
-    virtual void OnRemoveInterface(const InterfaceEntry & entry);
-
-
     typedef PSmartPtr<PInterfaceMonitorClient> ClientPtr;
 
     typedef std::list<PInterfaceMonitorClient *> ClientList_T;
@@ -159,7 +166,10 @@
 {
   PCLASSINFO(PInterfaceMonitorClient, PSafeObject);
   public:
-    PInterfaceMonitorClient();
+    enum {
+      DefaultPriority = 50,
+    };
+    PInterfaceMonitorClient(PINDEX priority = DefaultPriority);
     ~PInterfaceMonitorClient();
 
     typedef PIPSocket::InterfaceEntry InterfaceEntry;
@@ -188,7 +198,7 @@
        Higher priority clients get their callback functions called first. Clients
        with the same priority get called in the order of their insertion.
       */
-    virtual PINDEX GetPriority() const { return 50; }
+    PINDEX GetPriority() const { return priority; }
 
   protected:
     /// Call back function for when an interface has been added to the system
@@ -199,6 +209,8 @@
     
     /// Called when a PSTUNClient is about to be destroyed
     virtual void OnRemoveSTUNClient(const PSTUNClient * /*stun*/) { }
+    
+    PINDEX priority;
 
   friend class PInterfaceMonitor;
 };

Modified: ptlib/trunk/src/ptclib/psockbun.cxx
===================================================================
--- ptlib/trunk/src/ptclib/psockbun.cxx	2007-11-24 04:33:26 UTC (rev 18938)
+++ ptlib/trunk/src/ptclib/psockbun.cxx	2007-11-24 09:55:14 UTC (rev 18939)
@@ -44,7 +44,8 @@
 
 //////////////////////////////////////////////////
 
-PInterfaceMonitorClient::PInterfaceMonitorClient()
+PInterfaceMonitorClient::PInterfaceMonitorClient(PINDEX _priority)
+: priority(_priority)
 {
   PInterfaceMonitor::GetInstance().AddClient(this);
 }
@@ -199,23 +200,30 @@
 
     PIPSocket::InterfaceTable oldInterfaces = currentInterfaces;
     currentInterfaces = newInterfaces;
-
+    
     PTRACE(4, "IfaceMon\tInterface change detected, new list:\n" << setfill('\n') << currentInterfaces << setfill(' '));
-
+    
+    // calculate the set of interfaces to add / remove beforehand
+    PIPSocket::InterfaceTable interfacesToAdd;
+    PIPSocket::InterfaceTable interfacesToRemove;
+    interfacesToAdd.DisallowDeleteObjects();
+    interfacesToRemove.DisallowDeleteObjects();
+    
+    PINDEX i;
     // look for interfaces to add that are in new list that are not in the old list
-    PINDEX i;
     for (i = 0; i < newInterfaces.GetSize(); ++i) {
       PIPSocket::InterfaceEntry & newEntry = newInterfaces[i];
       if (!newEntry.GetAddress().IsLoopback() && !IsInterfaceInList(newEntry, oldInterfaces))
-        OnAddInterface(newEntry);
+        interfacesToAdd.Append(&newEntry);
     }
-
     // look for interfaces to remove that are in old list that are not in the new list
     for (i = 0; i < oldInterfaces.GetSize(); ++i) {
       PIPSocket::InterfaceEntry & oldEntry = oldInterfaces[i];
       if (!oldEntry.GetAddress().IsLoopback() && !IsInterfaceInList(oldEntry, newInterfaces))
-        OnRemoveInterface(oldEntry);
+        interfacesToRemove.Append(&oldEntry);
     }
+    
+    OnInterfacesChanged(interfacesToAdd, interfacesToRemove);
   }
 }
 
@@ -268,6 +276,18 @@
 }
 
 
+static BOOL InterfaceMatches(const PIPSocket::Address & addr,
+                             const PString & name,
+                             const PIPSocket::InterfaceEntry & entry)
+{
+  if ((addr.IsAny()   || entry.GetAddress() == addr) &&
+      (name.IsEmpty() || entry.GetName().NumCompare(name) == PString::EqualTo)) {
+    return TRUE;
+  }
+  return FALSE;
+}
+
+
 PStringArray PInterfaceMonitor::GetInterfaces(BOOL includeLoopBack, 
                                               const PIPSocket::Address & destination)
 {
@@ -325,8 +345,7 @@
 
   for (PINDEX i = 0; i < currentInterfaces.GetSize(); ++i) {
     PIPSocket::InterfaceEntry & entry = currentInterfaces[i];
-    if ((addr.IsAny()   || entry.GetAddress() == addr) &&
-        (name.IsEmpty() || entry.GetName().NumCompare(name) == EqualTo)) {
+    if (InterfaceMatches(addr, name, entry)) {
       info = entry;
       return TRUE;
     }
@@ -336,6 +355,18 @@
 }
 
 
+BOOL PInterfaceMonitor::IsMatchingInterface(const PString & iface, 
+                                            const PIPSocket::InterfaceEntry & entry)
+{
+  PIPSocket::Address addr;
+  PString name;
+  if (!SplitInterfaceDescription(iface, addr, name))
+    return FALSE;
+  
+  return InterfaceMatches(addr, name, entry);
+}
+
+
 void PInterfaceMonitor::SetInterfaceFilter(PInterfaceFilter * filter)
 {
   PWaitAndSignal m(mutex);
@@ -374,35 +405,26 @@
     Stop();
 }
 
-
-void PInterfaceMonitor::OnAddInterface(const PIPSocket::InterfaceEntry & entry)
+void PInterfaceMonitor::OnInterfacesChanged(const PIPSocket::InterfaceTable & addedInterfaces,
+                                            const PIPSocket::InterfaceTable & removedInterfaces)
 {
   PWaitAndSignal m(mutex);
-
+  
   for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
     PInterfaceMonitorClient * client = *iter;
     if (client->LockReadWrite()) {
-      client->OnAddInterface(entry);
+      for (PINDEX i = 0; i < addedInterfaces.GetSize(); i++) {
+        client->OnAddInterface(addedInterfaces[i]);
+      }
+      for (PINDEX i = 0; i < removedInterfaces.GetSize(); i++) {
+        client->OnRemoveInterface(removedInterfaces[i]);
+      }
       client->UnlockReadWrite();
     }
   }
 }
 
 
-void PInterfaceMonitor::OnRemoveInterface(const PIPSocket::InterfaceEntry & entry)
-{
-  PWaitAndSignal m(mutex);
-
-  for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
-    PInterfaceMonitorClient * client = *iter;
-    if (client->LockReadWrite()) {
-      client->OnRemoveInterface(entry);
-      client->UnlockReadWrite();
-    }
-  }
-}
-
-
 void PInterfaceMonitor::OnRemoveSTUNClient(const PSTUNClient *stun)
 {
   PWaitAndSignal m(mutex);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18957] ptlib/trunk

From: <csoutheren@us...> - 2007-11-26 13:27

Revision: 18957
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18957&view=rev
Author:   csoutheren
Date:     2007-11-26 05:27:08 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
Ensure VXML scripts end properly

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/vxml.h
    ptlib/trunk/src/ptclib/vxml.cxx

Modified: ptlib/trunk/include/ptclib/vxml.h
===================================================================
--- ptlib/trunk/include/ptclib/vxml.h	2007-11-26 11:26:28 UTC (rev 18956)
+++ ptlib/trunk/include/ptclib/vxml.h	2007-11-26 13:27:08 UTC (rev 18957)
@@ -166,9 +166,6 @@
     PVXMLSession(PTextToSpeech * tts = NULL, BOOL autoDelete = FALSE);
     virtual ~PVXMLSession();
 
-    void SetFinishWhenEmpty(BOOL v)
-    { finishWhenEmpty = v; }
-
     // new functions
     PTextToSpeech * SetTextToSpeech(PTextToSpeech * _tts, BOOL autoDelete = FALSE);
     PTextToSpeech * SetTextToSpeech(const PString & ttsName);
@@ -212,6 +209,8 @@
     virtual BOOL PlaySilence(PINDEX msecs = 0);
     virtual BOOL PlaySilence(const PTimeInterval & timeout);
 
+    virtual BOOL PlayStop();
+
     virtual void SetPause(BOOL pause);
     virtual void GetBeepData(PBYTEArray & data, unsigned ms);
 
@@ -302,8 +301,6 @@
     PSyncPoint    recordSync;
 
     BOOL loaded;
-    BOOL finishWhenEmpty;
-    BOOL allowFinish;
     PURL rootURL;
     BOOL emptyAction;
 
@@ -429,6 +426,16 @@
 
 //////////////////////////////////////////////////////////////////
 
+class PVXMLPlayableStop : public PVXMLPlayable
+{
+  PCLASSINFO(PVXMLPlayableStop, PVXMLPlayable);
+  public:
+    virtual void Play(PVXMLChannel & outgoingChannel);
+    virtual BOOL ReadFrame(PVXMLChannel & channel, void *, PINDEX);
+};
+
+//////////////////////////////////////////////////////////////////
+
 class PVXMLPlayableURL : public PVXMLPlayable
 {
   PCLASSINFO(PVXMLPlayableURL, PVXMLPlayable);

Modified: ptlib/trunk/src/ptclib/vxml.cxx
===================================================================
--- ptlib/trunk/src/ptclib/vxml.cxx	2007-11-26 11:26:28 UTC (rev 18956)
+++ ptlib/trunk/src/ptclib/vxml.cxx	2007-11-26 13:27:08 UTC (rev 18957)
@@ -137,6 +137,19 @@
 
 ///////////////////////////////////////////////////////////////
 
+void PVXMLPlayableStop::Play(PVXMLChannel & channel)
+{
+  channel.Close(); 
+}
+
+BOOL PVXMLPlayableStop::ReadFrame(PVXMLChannel & channel, void *, PINDEX)
+{ 
+  channel.Close(); 
+  return FALSE; 
+}
+
+///////////////////////////////////////////////////////////////
+
 BOOL PVXMLPlayableFilename::Open(PVXMLChannel & chan, const PString & _fn, PINDEX _delay, PINDEX _repeat, BOOL _autoDelete)
 { 
   fn = _fn; 
@@ -538,7 +551,6 @@
   vxmlThread       = NULL;
   threadRunning    = FALSE;
   vxmlChannel      = NULL;
-  finishWhenEmpty  = TRUE;
   textToSpeech     = NULL;
   loaded           = FALSE;
   emptyAction      = FALSE;
@@ -555,7 +567,6 @@
 void PVXMLSession::Initialise()
 {
   recording        = FALSE;
-  allowFinish      = FALSE;
   listening        = FALSE;
   activeGrammar    = NULL;
   listening        = FALSE;
@@ -663,7 +674,6 @@
 {
   PWaitAndSignal m(sessionMutex);
 
-  allowFinish = loaded = FALSE;
   rootURL = PString::Empty();
 
   // parse the XML
@@ -983,7 +993,7 @@
   }
 
   // Determine if we should quit
-  if ((currentNode == NULL) && (activeGrammar == NULL) && !IsPlaying() && !IsRecording() && allowFinish && finishWhenEmpty) {
+  if ((currentNode == NULL) && (activeGrammar == NULL) && !IsPlaying() && !IsRecording()) {
     threadRunning = FALSE;
     waitForEvent.Signal();
   }
@@ -1326,8 +1336,6 @@
   if (vxmlChannel == NULL || !vxmlChannel->QueueFile(fn, repeat, delay, autoDelete))
     return FALSE;
 
-  AllowClearCall();
-
   return TRUE;
 }
 
@@ -1336,8 +1344,6 @@
   if (vxmlChannel == NULL || !vxmlChannel->QueueCommand(cmd, repeat, delay))
     return FALSE;
 
-  AllowClearCall();
-
   return TRUE;
 }
 
@@ -1346,8 +1352,6 @@
   if (vxmlChannel == NULL || !vxmlChannel->QueueData(data, repeat, delay))
     return FALSE;
   
-  AllowClearCall();
-
   return TRUE;
 }
 
@@ -1356,8 +1360,6 @@
   if (vxmlChannel == NULL || !vxmlChannel->QueuePlayable("Tone", toneSpec, repeat, delay, true))
     return FALSE;
 
-  AllowClearCall();
-
   return TRUE;
 }
 
@@ -1378,8 +1380,14 @@
   if (vxmlChannel == NULL || !vxmlChannel->QueueData(nothing, 1, msecs))
     return FALSE;
 
-  AllowClearCall();
+  return TRUE;
+}
 
+BOOL PVXMLSession::PlayStop()
+{
+  if (vxmlChannel == NULL || !vxmlChannel->QueuePlayable(new PVXMLPlayableStop()))
+    return FALSE;
+
   return TRUE;
 }
 
@@ -1388,8 +1396,6 @@
   if (vxmlChannel == NULL || !vxmlChannel->QueueResource(url, repeat, delay))
     return FALSE;
 
-  AllowClearCall();
-
   return TRUE;
 }
 
@@ -1427,8 +1433,6 @@
   if (!vxmlChannel->QueuePlayable(playable))
     return FALSE;
 
-  AllowClearCall();
-
   return TRUE;
 }
 
@@ -1550,11 +1554,6 @@
   return new PWAVFile(mode, opts, fmt); 
 }
 
-void PVXMLSession::AllowClearCall()
-{
-  allowFinish = TRUE;
-}
-
 BOOL PVXMLSession::TraverseAudio()
 {
   if (!currentNode->IsElement()) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18972] ptlib/trunk

From: <ms30002000@us...> - 2007-11-27 19:28

Revision: 18972
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18972&view=rev
Author:   ms30002000
Date:     2007-11-27 11:28:49 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Added PSyncPoint with variable queue length

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/syncpoint.h
    ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h
    ptlib/trunk/src/ptlib/msos/win32.cxx
    ptlib/trunk/src/ptlib/unix/tlibthrd.cxx

Modified: ptlib/trunk/include/ptlib/syncpoint.h
===================================================================
--- ptlib/trunk/include/ptlib/syncpoint.h	2007-11-27 12:07:24 UTC (rev 18971)
+++ ptlib/trunk/include/ptlib/syncpoint.h	2007-11-27 19:28:49 UTC (rev 18972)
@@ -67,7 +67,8 @@
     /** Create a new sync point.
      */
     PSyncPoint();
-    PSyncPoint(const PSyncPoint &);
+    PSyncPoint(unsigned maxSignals);
+    PSyncPoint(const PSyncPoint & syncPoint);
 
 
 // Include platform dependent part of class

Modified: ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h
===================================================================
--- ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h	2007-11-27 12:07:24 UTC (rev 18971)
+++ ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h	2007-11-27 19:28:49 UTC (rev 18972)
@@ -47,6 +47,7 @@
     virtual BOOL WillBlock() const;
   private:
     unsigned signalCount;
+    unsigned maxSignalCount;
 #endif
 
 // End Of File ////////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptlib/msos/win32.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/win32.cxx	2007-11-27 12:07:24 UTC (rev 18971)
+++ ptlib/trunk/src/ptlib/msos/win32.cxx	2007-11-27 19:28:49 UTC (rev 18972)
@@ -1409,6 +1409,10 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // PSyncPoint
+PSyncPoint::PSyncPoint(unsigned maxSignals)
+  : PSemaphore(::CreateEvent(NULL, FALSE, maxSignals, NULL))
+{
+}
 
 PSyncPoint::PSyncPoint()
   : PSemaphore(::CreateEvent(NULL, FALSE, FALSE, NULL))

Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-27 12:07:24 UTC (rev 18971)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-27 19:28:49 UTC (rev 18972)
@@ -1387,20 +1387,31 @@
 }
 
 
+PSyncPoint::PSyncPoint(unsigned maxSignals)
+  : PSemaphore(PXSyncPoint)
+{
+  PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
+  PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
+  signalCount = 0;
+  maxSignalCount = maxSignals; 
+}
+
 PSyncPoint::PSyncPoint()
   : PSemaphore(PXSyncPoint)
 {
   PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
   PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
   signalCount = 0;
+  maxSignalCount = 0; 
 }
 
-PSyncPoint::PSyncPoint(const PSyncPoint &)
+PSyncPoint::PSyncPoint(const PSyncPoint & syncPoint)
   : PSemaphore(PXSyncPoint)
 {
   PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
   PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
   signalCount = 0;
+  maxSignalCount = syncPoint.maxSignalCount; 
 }
 
 PSyncPoint::~PSyncPoint()
@@ -1450,7 +1461,8 @@
 void PSyncPoint::Signal()
 {
   PAssertPTHREAD(pthread_mutex_lock, (&mutex));
-  signalCount++;
+  if ((maxSignalCount == 0) || (signalCount < maxSignalCount))
+    signalCount++;
   PAssertPTHREAD(pthread_cond_signal, (&condVar));
   PAssertPTHREAD(pthread_mutex_unlock, (&mutex));
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18973] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-27 23:45

Revision: 18973
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18973&view=rev
Author:   rjongbloed
Date:     2007-11-27 15:45:44 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Rolled back revision 18972 as has portability issues.

Revision Links:
--------------
    http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18972&view=rev

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/syncpoint.h
    ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h
    ptlib/trunk/src/ptlib/msos/win32.cxx
    ptlib/trunk/src/ptlib/unix/tlibthrd.cxx

Modified: ptlib/trunk/include/ptlib/syncpoint.h
===================================================================
--- ptlib/trunk/include/ptlib/syncpoint.h	2007-11-27 19:28:49 UTC (rev 18972)
+++ ptlib/trunk/include/ptlib/syncpoint.h	2007-11-27 23:45:44 UTC (rev 18973)
@@ -67,8 +67,7 @@
     /** Create a new sync point.
      */
     PSyncPoint();
-    PSyncPoint(unsigned maxSignals);
-    PSyncPoint(const PSyncPoint & syncPoint);
+    PSyncPoint(const PSyncPoint &);
 
 
 // Include platform dependent part of class

Modified: ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h
===================================================================
--- ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h	2007-11-27 19:28:49 UTC (rev 18972)
+++ ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h	2007-11-27 23:45:44 UTC (rev 18973)
@@ -47,7 +47,6 @@
     virtual BOOL WillBlock() const;
   private:
     unsigned signalCount;
-    unsigned maxSignalCount;
 #endif
 
 // End Of File ////////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptlib/msos/win32.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/win32.cxx	2007-11-27 19:28:49 UTC (rev 18972)
+++ ptlib/trunk/src/ptlib/msos/win32.cxx	2007-11-27 23:45:44 UTC (rev 18973)
@@ -1409,10 +1409,6 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // PSyncPoint
-PSyncPoint::PSyncPoint(unsigned maxSignals)
-  : PSemaphore(::CreateEvent(NULL, FALSE, maxSignals, NULL))
-{
-}
 
 PSyncPoint::PSyncPoint()
   : PSemaphore(::CreateEvent(NULL, FALSE, FALSE, NULL))

Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-27 19:28:49 UTC (rev 18972)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-27 23:45:44 UTC (rev 18973)
@@ -1387,31 +1387,20 @@
 }
 
 
-PSyncPoint::PSyncPoint(unsigned maxSignals)
-  : PSemaphore(PXSyncPoint)
-{
-  PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
-  PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
-  signalCount = 0;
-  maxSignalCount = maxSignals; 
-}
-
 PSyncPoint::PSyncPoint()
   : PSemaphore(PXSyncPoint)
 {
   PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
   PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
   signalCount = 0;
-  maxSignalCount = 0; 
 }
 
-PSyncPoint::PSyncPoint(const PSyncPoint & syncPoint)
+PSyncPoint::PSyncPoint(const PSyncPoint &)
   : PSemaphore(PXSyncPoint)
 {
   PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
   PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
   signalCount = 0;
-  maxSignalCount = syncPoint.maxSignalCount; 
 }
 
 PSyncPoint::~PSyncPoint()
@@ -1461,8 +1450,7 @@
 void PSyncPoint::Signal()
 {
   PAssertPTHREAD(pthread_mutex_lock, (&mutex));
-  if ((maxSignalCount == 0) || (signalCount < maxSignalCount))
-    signalCount++;
+  signalCount++;
   PAssertPTHREAD(pthread_cond_signal, (&condVar));
   PAssertPTHREAD(pthread_mutex_unlock, (&mutex));
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18974] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-28 00:45

Revision: 18974
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18974&view=rev
Author:   rjongbloed
Date:     2007-11-27 16:45:18 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Doumented more details on the semantics of the PSyncPoint class, and changed the posix implementation to agree with those semantics. In particular what happens on multiple Signal() calls.

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/syncpoint.h
    ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h
    ptlib/trunk/src/ptlib/unix/tlibthrd.cxx

Modified: ptlib/trunk/include/ptlib/syncpoint.h
===================================================================
--- ptlib/trunk/include/ptlib/syncpoint.h	2007-11-27 23:45:44 UTC (rev 18973)
+++ ptlib/trunk/include/ptlib/syncpoint.h	2007-11-28 00:45:18 UTC (rev 18974)
@@ -43,7 +43,7 @@
 
 /** This class defines a thread synchonisation object.
   This form of semaphore is used to indicate an {\it event} has occurred. A
-  thread may block on theis sync point and wait until another thread signals
+  thread may block on the sync point and wait until another thread signals
   that it may continue. eg:
 \begin{verbatim}
     ... thread one
@@ -58,6 +58,12 @@
     do_yet_more();
 
 \end{verbatim}
+
+  Note that events are boolean in nature. If "thread one" is not waiting on the
+  event, multiple calls to Signal() are ignored, thread one will only exit the
+  Wait() call a sibngle time once it gets there. Similarly, if multiple threads
+  are waiting on the event, only one thread will be released. As you cannot know
+  which thread will be released this mode of use is not recommended.
  */
 class PSyncPoint : public PSemaphore
 {

Modified: ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h
===================================================================
--- ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h	2007-11-27 23:45:44 UTC (rev 18973)
+++ ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h	2007-11-28 00:45:18 UTC (rev 18974)
@@ -46,7 +46,7 @@
     virtual void Signal();
     virtual BOOL WillBlock() const;
   private:
-    unsigned signalCount;
+    bool signalled;
 #endif
 
 // End Of File ////////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-27 23:45:44 UTC (rev 18973)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-28 00:45:18 UTC (rev 18974)
@@ -1392,7 +1392,7 @@
 {
   PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
   PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
-  signalCount = 0;
+  signalled = false;
 }
 
 PSyncPoint::PSyncPoint(const PSyncPoint &)
@@ -1400,7 +1400,7 @@
 {
   PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
   PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
-  signalCount = 0;
+  signalled = false;
 }
 
 PSyncPoint::~PSyncPoint()
@@ -1412,9 +1412,9 @@
 void PSyncPoint::Wait()
 {
   PAssertPTHREAD(pthread_mutex_lock, (&mutex));
-  while (signalCount == 0)
+  while (!signalled)
     pthread_cond_wait(&condVar, &mutex);
-  signalCount--;
+  signalled = false;
   PAssertPTHREAD(pthread_mutex_unlock, (&mutex));
 }
 
@@ -1430,7 +1430,7 @@
   absTime.tv_nsec = finishTime.GetMicrosecond() * 1000;
 
   int err = 0;
-  while (signalCount == 0) {
+  while (!signalled) {
     err = pthread_cond_timedwait(&condVar, &mutex, &absTime);
     if (err == 0 || err == ETIMEDOUT)
       break;
@@ -1439,7 +1439,7 @@
   }
 
   if (err == 0)
-    signalCount--;
+    signalled = false;
 
   PAssertPTHREAD(pthread_mutex_unlock, (&mutex));
 
@@ -1450,7 +1450,7 @@
 void PSyncPoint::Signal()
 {
   PAssertPTHREAD(pthread_mutex_lock, (&mutex));
-  signalCount++;
+  signalled = true;
   PAssertPTHREAD(pthread_cond_signal, (&condVar));
   PAssertPTHREAD(pthread_mutex_unlock, (&mutex));
 }
@@ -1458,7 +1458,7 @@
 
 BOOL PSyncPoint::WillBlock() const
 {
-  return signalCount == 0;
+  return !signalled;
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18980] ptlib/trunk

From: <csoutheren@us...> - 2007-11-28 04:37

Revision: 18980
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18980&view=rev
Author:   csoutheren
Date:     2007-11-27 20:37:12 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Add support for Expat 2.0 installer

Modified Paths:
--------------
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2007-11-28 04:35:25 UTC (rev 18979)
+++ ptlib/trunk/configure.ac	2007-11-28 04:37:12 UTC (rev 18980)
@@ -1394,6 +1394,13 @@
 dnl MSWIN_CHECK_DIR  winexpat,source\lib
 dnl MSWIN_CHECK_DIR  winexpat,\libs\expat\
 
+dnl MSWIN_DISPLAY    win_expat,Windows Expat XML2
+dnl MSWIN_IF_FEATURE win_expat,!expat
+dnl MSWIN_CHECK_FILE win_expat,bin\libexpatMT.lib,P_WINEXPAT=2
+dnl MSWIN_DIR_SYMBOL win_expat,WINEXPAT2_DIR
+dnl MSWIN_CHECK_DIR  win_expat,source\lib
+dnl MSWIN_CHECK_DIR  win_expat,\libs\expat\
+
 AC_ARG_ENABLE(expat,
        [  --disable-expat         disable XML support])
 

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2007-11-28 04:35:25 UTC (rev 18979)
+++ ptlib/trunk/include/ptbuildopts.h.in	2007-11-28 04:37:12 UTC (rev 18980)
@@ -298,9 +298,14 @@
 
 #ifdef P_WINEXPAT
 
+
+#if P_WINEXPAT == 2
+#pragma include_alias(<expat.h>, <@WINEXPAT2_DIR@...>)
+#define P_EXPAT_LIBRARY "@WINEXPAT2_DIR@..."
+#else 
 #pragma include_alias(<expat.h>, <@WINEXPAT_DIR@...>)
-
 #define P_EXPAT_LIBRARY "@WINEXPAT_DIR@..."
+#endif
 
 #else
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18983] ptlib/trunk

From: <csoutheren@us...> - 2007-11-28 05:56

Revision: 18983
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18983&view=rev
Author:   csoutheren
Date:     2007-11-27 21:56:10 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Add delay to PlayableStop

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/vxml.h
    ptlib/trunk/src/ptclib/vxml.cxx

Modified: ptlib/trunk/include/ptclib/vxml.h
===================================================================
--- ptlib/trunk/include/ptclib/vxml.h	2007-11-28 05:20:03 UTC (rev 18982)
+++ ptlib/trunk/include/ptclib/vxml.h	2007-11-28 05:56:10 UTC (rev 18983)
@@ -596,6 +596,8 @@
     unsigned GetSampleFrequency() const
     { return sampleFrequency; }
 
+	  void SetSilentCount(int v) { silentCount = v; }
+
   protected:
     PVXMLChannelInterface * vxmlInterface;
 

Modified: ptlib/trunk/src/ptclib/vxml.cxx
===================================================================
--- ptlib/trunk/src/ptclib/vxml.cxx	2007-11-28 05:20:03 UTC (rev 18982)
+++ ptlib/trunk/src/ptclib/vxml.cxx	2007-11-28 05:56:10 UTC (rev 18983)
@@ -139,6 +139,7 @@
 
 void PVXMLPlayableStop::Play(PVXMLChannel & channel)
 {
+	channel.SetSilentCount(20);
   channel.Close(); 
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [18985] ptlib/trunk

From: <csoutheren@us...> - 2007-11-28 07:47

Revision: 18985
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18985&view=rev
Author:   csoutheren
Date:     2007-11-27 23:47:52 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
More fixes for delay end of script problem

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/vxml.h
    ptlib/trunk/src/ptclib/vxml.cxx

Modified: ptlib/trunk/include/ptclib/vxml.h
===================================================================
--- ptlib/trunk/include/ptclib/vxml.h	2007-11-28 05:56:28 UTC (rev 18984)
+++ ptlib/trunk/include/ptclib/vxml.h	2007-11-28 07:47:52 UTC (rev 18985)
@@ -377,11 +377,9 @@
     PVXMLPlayable()
     { repeat = 1; delay = 0; sampleFrequency = 8000; autoDelete = FALSE; delayDone = FALSE; }
 
-    virtual BOOL Open(PVXMLChannel & /*chan*/, PINDEX _delay, PINDEX _repeat, BOOL _autoDelete)
-    { delay = _delay; repeat = _repeat; autoDelete = _autoDelete; return TRUE; }
+    virtual BOOL Open(PVXMLChannel & chan, PINDEX _delay, PINDEX _repeat, BOOL _autoDelete);
 
-    virtual BOOL Open(PVXMLChannel & chan, const PString & _arg, PINDEX _delay, PINDEX _repeat, BOOL v)
-    { arg = _arg; return Open(chan, _delay, _repeat, v); }
+    virtual BOOL Open(PVXMLChannel & chan, const PString & _arg, PINDEX _delay, PINDEX _repeat, BOOL v);
 
     virtual void Play(PVXMLChannel & outgoingChannel) = 0;
 

Modified: ptlib/trunk/src/ptclib/vxml.cxx
===================================================================
--- ptlib/trunk/src/ptclib/vxml.cxx	2007-11-28 05:56:28 UTC (rev 18984)
+++ ptlib/trunk/src/ptclib/vxml.cxx	2007-11-28 07:47:52 UTC (rev 18985)
@@ -116,6 +116,21 @@
 
 ///////////////////////////////////////////////////////////////
 
+BOOL PVXMLPlayable::Open(PVXMLChannel & chan, PINDEX _delay, PINDEX _repeat, BOOL _autoDelete)
+{ 
+  chan.SetReadChannel(NULL); 
+  delay = _delay; 
+  repeat = _repeat; 
+  autoDelete = _autoDelete; 
+  return TRUE; 
+}
+
+BOOL PVXMLPlayable::Open(PVXMLChannel & chan, const PString & _arg, PINDEX _delay, PINDEX _repeat, BOOL v)
+{ 
+  arg = _arg; 
+  return Open(chan, _delay, _repeat, v); 
+}
+
 BOOL PVXMLPlayable::ReadFrame(PVXMLChannel & channel, void * _buf, PINDEX origLen)
 {
   BYTE * buf = (BYTE *)_buf;
@@ -140,7 +155,6 @@
 void PVXMLPlayableStop::Play(PVXMLChannel & channel)
 {
 	channel.SetSilentCount(20);
-  channel.Close(); 
 }
 
 BOOL PVXMLPlayableStop::ReadFrame(PVXMLChannel & channel, void *, PINDEX)
@@ -2431,13 +2445,10 @@
       }
 
       // try and read data from the underlying channel
-      if (GetBaseReadChannel() != NULL) {
+      else if (currentPlayItem != NULL) {
 
         PWaitAndSignal m(queueMutex);
 
-        // see if the item needs to repeat
-        PAssert(currentPlayItem != NULL, "current VXML play item disappeared");
-
         // if the read succeeds, we are done
         if (currentPlayItem->ReadFrame(*this, buffer, amount)) {
           totalData += amount;
@@ -2455,33 +2466,35 @@
         PTRACE(3, "PVXML\tFinished playing " << totalData << " bytes");
         PDelayChannel::Close();
 
-        // repeat the item if needed
-        if (currentPlayItem->GetRepeat() > 1) {
-          if (!currentPlayItem->Rewind(GetBaseReadChannel())) {
-            PTRACE(3, "PVXML\tCannot rewind item - cancelling repeat");
-          } else {
-            currentPlayItem->SetRepeat(currentPlayItem->GetRepeat()-1);
-            currentPlayItem->OnRepeat(*this);
-            continue;
+        // if current item still active, check for trailing actions
+        if (currentPlayItem != NULL) {
+          if (currentPlayItem->GetRepeat() > 1) {
+            if (!currentPlayItem->Rewind(GetBaseReadChannel())) {
+              PTRACE(3, "PVXML\tCannot rewind item - cancelling repeat");
+            } else {
+              currentPlayItem->SetRepeat(currentPlayItem->GetRepeat()-1);
+              currentPlayItem->OnRepeat(*this);
+              continue;
+            }
+          } 
+
+          // see if end of queue delay specified
+          PINDEX delay = 0;
+          if (currentPlayItem->delayDone) {
+            delay = currentPlayItem->GetDelay();
+            if (delay != 0) {
+              PTRACE(3, "PVXML\tDelaying for " << delay);
+              delayTimer = delay;
+              currentPlayItem->delayDone = TRUE;
+              continue;
+            }
           }
-        } 
 
-        // see if end of queue delay specified
-        PINDEX delay = 0;
-        if (currentPlayItem->delayDone) {
-          delay = currentPlayItem->GetDelay();
-          if (delay != 0) {
-            PTRACE(3, "PVXML\tDelaying for " << delay);
-            delayTimer = delay;
-            currentPlayItem->delayDone = TRUE;
-            continue;
-          }
+          // stop the current item
+          currentPlayItem->OnStop();
+          delete currentPlayItem;
+          currentPlayItem = NULL;
         }
-
-        // stop the current item
-        currentPlayItem->OnStop();
-        delete currentPlayItem;
-        currentPlayItem = NULL;
       }
 
       // check the queue for the next action


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19008] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-29 09:17

Revision: 19008
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19008&view=rev
Author:   rjongbloed
Date:     2007-11-29 01:17:41 -0800 (Thu, 29 Nov 2007)

Log Message:
-----------
Merged BOOL branch changes to trunk.

Modified Paths:
--------------
    ptlib/trunk/ReadMe_QOS.txt
    ptlib/trunk/configure
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in
    ptlib/trunk/include/ptclib/asnber.h
    ptlib/trunk/include/ptclib/asner.h
    ptlib/trunk/include/ptclib/asnper.h
    ptlib/trunk/include/ptclib/asnxer.h
    ptlib/trunk/include/ptclib/cypher.h
    ptlib/trunk/include/ptclib/delaychan.h
    ptlib/trunk/include/ptclib/enum.h
    ptlib/trunk/include/ptclib/ftp.h
    ptlib/trunk/include/ptclib/guid.h
    ptlib/trunk/include/ptclib/html.h
    ptlib/trunk/include/ptclib/http.h
    ptlib/trunk/include/ptclib/httpform.h
    ptlib/trunk/include/ptclib/httpsvc.h
    ptlib/trunk/include/ptclib/inetmail.h
    ptlib/trunk/include/ptclib/inetprot.h
    ptlib/trunk/include/ptclib/ipacl.h
    ptlib/trunk/include/ptclib/memfile.h
    ptlib/trunk/include/ptclib/mime.h
    ptlib/trunk/include/ptclib/modem.h
    ptlib/trunk/include/ptclib/paec.h
    ptlib/trunk/include/ptclib/pasn.h
    ptlib/trunk/include/ptclib/pdns.h
    ptlib/trunk/include/ptclib/pils.h
    ptlib/trunk/include/ptclib/pldap.h
    ptlib/trunk/include/ptclib/pnat.h
    ptlib/trunk/include/ptclib/podbc.h
    ptlib/trunk/include/ptclib/psasl.h
    ptlib/trunk/include/ptclib/psnmp.h
    ptlib/trunk/include/ptclib/psoap.h
    ptlib/trunk/include/ptclib/psockbun.h
    ptlib/trunk/include/ptclib/pssl.h
    ptlib/trunk/include/ptclib/pstun.h
    ptlib/trunk/include/ptclib/ptts.h
    ptlib/trunk/include/ptclib/pvfiledev.h
    ptlib/trunk/include/ptclib/pvidfile.h
    ptlib/trunk/include/ptclib/pwavfile.h
    ptlib/trunk/include/ptclib/pwavfiledev.h
    ptlib/trunk/include/ptclib/pxml.h
    ptlib/trunk/include/ptclib/pxmlrpc.h
    ptlib/trunk/include/ptclib/pxmlrpcs.h
    ptlib/trunk/include/ptclib/qchannel.h
    ptlib/trunk/include/ptclib/rfc1155.h
    ptlib/trunk/include/ptclib/shttpsvc.h
    ptlib/trunk/include/ptclib/snmp.h
    ptlib/trunk/include/ptclib/sockagg.h
    ptlib/trunk/include/ptclib/socks.h
    ptlib/trunk/include/ptclib/telnet.h
    ptlib/trunk/include/ptclib/url.h
    ptlib/trunk/include/ptclib/vsdl.h
    ptlib/trunk/include/ptclib/vxml.h
    ptlib/trunk/include/ptclib/xmpp.h
    ptlib/trunk/include/ptclib/xmpp_c2s.h
    ptlib/trunk/include/ptclib/xmpp_muc.h
    ptlib/trunk/include/ptclib/xmpp_roster.h
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/channel.h
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/conchan.h
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/ethsock.h
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/ptlib.inl
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/remconn.h
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/serchan.h
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/socket.h
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/sound.h
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/tcpsock.h
    ptlib/trunk/include/ptlib/Nucleus++/ptlib/thread.h
    ptlib/trunk/include/ptlib/args.h
    ptlib/trunk/include/ptlib/array.h
    ptlib/trunk/include/ptlib/channel.h
    ptlib/trunk/include/ptlib/conchan.h
    ptlib/trunk/include/ptlib/config.h
    ptlib/trunk/include/ptlib/contain.h
    ptlib/trunk/include/ptlib/contain.inl
    ptlib/trunk/include/ptlib/critsec.h
    ptlib/trunk/include/ptlib/dict.h
    ptlib/trunk/include/ptlib/dynalink.h
    ptlib/trunk/include/ptlib/ethsock.h
    ptlib/trunk/include/ptlib/file.h
    ptlib/trunk/include/ptlib/filepath.h
    ptlib/trunk/include/ptlib/icmpsock.h
    ptlib/trunk/include/ptlib/indchan.h
    ptlib/trunk/include/ptlib/int64.h
    ptlib/trunk/include/ptlib/ipdsock.h
    ptlib/trunk/include/ptlib/ipsock.h
    ptlib/trunk/include/ptlib/ipxsock.h
    ptlib/trunk/include/ptlib/lists.h
    ptlib/trunk/include/ptlib/mail.h
    ptlib/trunk/include/ptlib/msos/ptlib/conchan.h
    ptlib/trunk/include/ptlib/msos/ptlib/file.h
    ptlib/trunk/include/ptlib/msos/ptlib/icmpsock.h
    ptlib/trunk/include/ptlib/msos/ptlib/mail.h
    ptlib/trunk/include/ptlib/msos/ptlib/pdirect.h
    ptlib/trunk/include/ptlib/msos/ptlib/pipechan.h
    ptlib/trunk/include/ptlib/msos/ptlib/pprocess.h
    ptlib/trunk/include/ptlib/msos/ptlib/ptlib.inl
    ptlib/trunk/include/ptlib/msos/ptlib/serchan.h
    ptlib/trunk/include/ptlib/msos/ptlib/socket.h
    ptlib/trunk/include/ptlib/msos/ptlib/sound.h
    ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h
    ptlib/trunk/include/ptlib/msos/ptlib/sound_win32.h
    ptlib/trunk/include/ptlib/msos/ptlib/svcproc.h
    ptlib/trunk/include/ptlib/msos/ptlib/textfile.h
    ptlib/trunk/include/ptlib/msos/ptlib/udpsock.h
    ptlib/trunk/include/ptlib/msos/ptlib/video.h
    ptlib/trunk/include/ptlib/msos/ptlib/videoio.h
    ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
    ptlib/trunk/include/ptlib/notifier_ext.h
    ptlib/trunk/include/ptlib/object.h
    ptlib/trunk/include/ptlib/osutil.inl
    ptlib/trunk/include/ptlib/pdirect.h
    ptlib/trunk/include/ptlib/pfactory.h
    ptlib/trunk/include/ptlib/pipechan.h
    ptlib/trunk/include/ptlib/plugin.h
    ptlib/trunk/include/ptlib/pluginmgr.h
    ptlib/trunk/include/ptlib/pprocess.h
    ptlib/trunk/include/ptlib/psharedptr.h
    ptlib/trunk/include/ptlib/pstring.h
    ptlib/trunk/include/ptlib/psync.h
    ptlib/trunk/include/ptlib/ptime.h
    ptlib/trunk/include/ptlib/remconn.h
    ptlib/trunk/include/ptlib/safecoll.h
    ptlib/trunk/include/ptlib/semaphor.h
    ptlib/trunk/include/ptlib/serchan.h
    ptlib/trunk/include/ptlib/sfile.h
    ptlib/trunk/include/ptlib/smartptr.h
    ptlib/trunk/include/ptlib/socket.h
    ptlib/trunk/include/ptlib/sound.h
    ptlib/trunk/include/ptlib/spxsock.h
    ptlib/trunk/include/ptlib/svcproc.h
    ptlib/trunk/include/ptlib/syncthrd.h
    ptlib/trunk/include/ptlib/tcpsock.h
    ptlib/trunk/include/ptlib/textfile.h
    ptlib/trunk/include/ptlib/thread.h
    ptlib/trunk/include/ptlib/timeint.h
    ptlib/trunk/include/ptlib/timer.h
    ptlib/trunk/include/ptlib/udpsock.h
    ptlib/trunk/include/ptlib/unix/ptlib/beaudio.h
    ptlib/trunk/include/ptlib/unix/ptlib/bevideo.h
    ptlib/trunk/include/ptlib/unix/ptlib/channel.h
    ptlib/trunk/include/ptlib/unix/ptlib/conchan.h
    ptlib/trunk/include/ptlib/unix/ptlib/ethsock.h
    ptlib/trunk/include/ptlib/unix/ptlib/icmpsock.h
    ptlib/trunk/include/ptlib/unix/ptlib/maccoreaudio.h
    ptlib/trunk/include/ptlib/unix/ptlib/mutex.h
    ptlib/trunk/include/ptlib/unix/ptlib/pprocess.h
    ptlib/trunk/include/ptlib/unix/ptlib/ptlib.inl
    ptlib/trunk/include/ptlib/unix/ptlib/remconn.h
    ptlib/trunk/include/ptlib/unix/ptlib/semaphor.h
    ptlib/trunk/include/ptlib/unix/ptlib/serchan.h
    ptlib/trunk/include/ptlib/unix/ptlib/shmvideo.h
    ptlib/trunk/include/ptlib/unix/ptlib/socket.h
    ptlib/trunk/include/ptlib/unix/ptlib/sound.h
    ptlib/trunk/include/ptlib/unix/ptlib/svcproc.h
    ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h
    ptlib/trunk/include/ptlib/unix/ptlib/tcpsock.h
    ptlib/trunk/include/ptlib/unix/ptlib/thread.h
    ptlib/trunk/include/ptlib/unix/ptlib/video.h
    ptlib/trunk/include/ptlib/unix/ptlib/videoio.h
    ptlib/trunk/include/ptlib/vconvert.h
    ptlib/trunk/include/ptlib/video.h
    ptlib/trunk/include/ptlib/videoio.h
    ptlib/trunk/include/ptlib/videoio1394dc.h
    ptlib/trunk/include/ptlib/wince/mmsystemx.h
    ptlib/trunk/include/ptlib/wince/snmp.h
    ptlib/trunk/include/ptlib/wince/stdlibx.h
    ptlib/trunk/plugins/sound_alsa/sound_alsa.cxx
    ptlib/trunk/plugins/sound_alsa/sound_alsa.h
    ptlib/trunk/plugins/sound_esd/sound_esd.cxx
    ptlib/trunk/plugins/sound_esd/sound_esd.h
    ptlib/trunk/plugins/sound_oss/sound_oss.cxx
    ptlib/trunk/plugins/sound_oss/sound_oss.h
    ptlib/trunk/plugins/sound_sunaudio/sound_sunaudio.cxx
    ptlib/trunk/plugins/sound_sunaudio/sound_sunaudio.h
    ptlib/trunk/plugins/vidinput_avc/vidinput_avc.cxx
    ptlib/trunk/plugins/vidinput_avc/vidinput_avc.h
    ptlib/trunk/plugins/vidinput_bsd/vidinput_bsd.cxx
    ptlib/trunk/plugins/vidinput_bsd/vidinput_bsd.h
    ptlib/trunk/plugins/vidinput_dc/video4dc1394.cxx
    ptlib/trunk/plugins/vidinput_dc/videoio1394dc.h
    ptlib/trunk/plugins/vidinput_v4l/vidinput_v4l.cxx
    ptlib/trunk/plugins/vidinput_v4l/vidinput_v4l.h
    ptlib/trunk/plugins/vidinput_v4l2/vidinput_v4l2.cxx
    ptlib/trunk/plugins/vidinput_v4l2/vidinput_v4l2.h
    ptlib/trunk/samples/ThreadSafe/main.cxx
    ptlib/trunk/samples/address/local.cxx
    ptlib/trunk/samples/aggtest/main.cxx
    ptlib/trunk/samples/audio/audio.cxx
    ptlib/trunk/samples/audio/audio.h
    ptlib/trunk/samples/dnstest/main.cxx
    ptlib/trunk/samples/dtmftest/main.cxx
    ptlib/trunk/samples/emailtest/main.cxx
    ptlib/trunk/samples/find_ip/find_ip.cxx
    ptlib/trunk/samples/hello_world/helloDLL_2005.vcproj
    ptlib/trunk/samples/hello_world/hello_2005.vcproj
    ptlib/trunk/samples/ipv6test/main.cxx
    ptlib/trunk/samples/ldaptest/main.cxx
    ptlib/trunk/samples/md5/encrypt.cxx
    ptlib/trunk/samples/ptimer/main.cxx
    ptlib/trunk/samples/ptimer/main.h
    ptlib/trunk/samples/safetest/main.cxx
    ptlib/trunk/samples/safetest/main.h
    ptlib/trunk/samples/serial/serial.cxx
    ptlib/trunk/samples/strtest/main.cxx
    ptlib/trunk/samples/thread/thread.cxx
    ptlib/trunk/samples/threadex/main.cxx
    ptlib/trunk/samples/threadex/main.h
    ptlib/trunk/samples/vxmltest/main.cxx
    ptlib/trunk/samples/vxmltest/main.h
    ptlib/trunk/samples/xmlrpc/main.cxx
    ptlib/trunk/samples/xmlrpcsrvr/main.cxx
    ptlib/trunk/samples/xmlrpcsrvr/main.h
    ptlib/trunk/samples/xmppconsole/main.cxx
    ptlib/trunk/samples/xmppconsole/main.h
    ptlib/trunk/samples/xmpptest/ConnectDialog.cxx
    ptlib/trunk/samples/xmpptest/MainFrame.cxx
    ptlib/trunk/samples/xmpptest/main.cxx
    ptlib/trunk/src/ptclib/asnber.cxx
    ptlib/trunk/src/ptclib/asner.cxx
    ptlib/trunk/src/ptclib/asnper.cxx
    ptlib/trunk/src/ptclib/asnxer.cxx
    ptlib/trunk/src/ptclib/cypher.cxx
    ptlib/trunk/src/ptclib/delaychan.cxx
    ptlib/trunk/src/ptclib/enum.cxx
    ptlib/trunk/src/ptclib/ftp.cxx
    ptlib/trunk/src/ptclib/ftpclnt.cxx
    ptlib/trunk/src/ptclib/ftpsrvr.cxx
    ptlib/trunk/src/ptclib/guid.cxx
    ptlib/trunk/src/ptclib/html.cxx
    ptlib/trunk/src/ptclib/http.cxx
    ptlib/trunk/src/ptclib/httpclnt.cxx
    ptlib/trunk/src/ptclib/httpform.cxx
    ptlib/trunk/src/ptclib/httpsrvr.cxx
    ptlib/trunk/src/ptclib/httpsvc.cxx
    ptlib/trunk/src/ptclib/inetmail.cxx
    ptlib/trunk/src/ptclib/inetprot.cxx
    ptlib/trunk/src/ptclib/ipacl.cxx
    ptlib/trunk/src/ptclib/memfile.cxx
    ptlib/trunk/src/ptclib/modem.cxx
    ptlib/trunk/src/ptclib/pasn.cxx
    ptlib/trunk/src/ptclib/pdns.cxx
    ptlib/trunk/src/ptclib/pils.cxx
    ptlib/trunk/src/ptclib/pldap.cxx
    ptlib/trunk/src/ptclib/pnat.cxx
    ptlib/trunk/src/ptclib/podbc.cxx
    ptlib/trunk/src/ptclib/psasl.cxx
    ptlib/trunk/src/ptclib/psoap.cxx
    ptlib/trunk/src/ptclib/psockbun.cxx
    ptlib/trunk/src/ptclib/pssl.cxx
    ptlib/trunk/src/ptclib/pstun.cxx
    ptlib/trunk/src/ptclib/ptts.cxx
    ptlib/trunk/src/ptclib/pvfiledev.cxx
    ptlib/trunk/src/ptclib/pvidfile.cxx
    ptlib/trunk/src/ptclib/pwavfile.cxx
    ptlib/trunk/src/ptclib/pwavfiledev.cxx
    ptlib/trunk/src/ptclib/pxml.cxx
    ptlib/trunk/src/ptclib/pxmlrpc.cxx
    ptlib/trunk/src/ptclib/pxmlrpcs.cxx
    ptlib/trunk/src/ptclib/qchannel.cxx
    ptlib/trunk/src/ptclib/rfc1155.cxx
    ptlib/trunk/src/ptclib/shttpsvc.cxx
    ptlib/trunk/src/ptclib/snmp.cxx
    ptlib/trunk/src/ptclib/snmpclnt.cxx
    ptlib/trunk/src/ptclib/snmpserv.cxx
    ptlib/trunk/src/ptclib/sockagg.cxx
    ptlib/trunk/src/ptclib/socks.cxx
    ptlib/trunk/src/ptclib/speex_echo/paec.cxx
    ptlib/trunk/src/ptclib/telnet.cxx
    ptlib/trunk/src/ptclib/vsdl.cxx
    ptlib/trunk/src/ptclib/vxml.cxx
    ptlib/trunk/src/ptclib/xmpp.cxx
    ptlib/trunk/src/ptclib/xmpp_c2s.cxx
    ptlib/trunk/src/ptclib/xmpp_muc.cxx
    ptlib/trunk/src/ptclib/xmpp_roster.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusChannel.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusConChan.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusConfig.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusPDirectory.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusPFile.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusPFilePath.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusPTime.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusPtlib.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusSemaphore.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusSoundBite.cxx
    ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx
    ptlib/trunk/src/ptlib/Nucleus++/socket.cxx
    ptlib/trunk/src/ptlib/common/collect.cxx
    ptlib/trunk/src/ptlib/common/contain.cxx
    ptlib/trunk/src/ptlib/common/notifier_ext.cxx
    ptlib/trunk/src/ptlib/common/object.cxx
    ptlib/trunk/src/ptlib/common/osutils.cxx
    ptlib/trunk/src/ptlib/common/pchannel.cxx
    ptlib/trunk/src/ptlib/common/pconfig.cxx
    ptlib/trunk/src/ptlib/common/pethsock.cxx
    ptlib/trunk/src/ptlib/common/pipechan.cxx
    ptlib/trunk/src/ptlib/common/pluginmgr.cxx
    ptlib/trunk/src/ptlib/common/ptime.cxx
    ptlib/trunk/src/ptlib/common/pvidchan.cxx
    ptlib/trunk/src/ptlib/common/safecoll.cxx
    ptlib/trunk/src/ptlib/common/serial.cxx
    ptlib/trunk/src/ptlib/common/sfile.cxx
    ptlib/trunk/src/ptlib/common/sockets.cxx
    ptlib/trunk/src/ptlib/common/sound.cxx
    ptlib/trunk/src/ptlib/common/vconvert.cxx
    ptlib/trunk/src/ptlib/common/vfakeio.cxx
    ptlib/trunk/src/ptlib/common/videoio.cxx
    ptlib/trunk/src/ptlib/msos/assert.cxx
    ptlib/trunk/src/ptlib/msos/dossock.cxx
    ptlib/trunk/src/ptlib/msos/doswin.cxx
    ptlib/trunk/src/ptlib/msos/ethsock.cxx
    ptlib/trunk/src/ptlib/msos/icmp.cxx
    ptlib/trunk/src/ptlib/msos/mail.cxx
    ptlib/trunk/src/ptlib/msos/msdos.cxx
    ptlib/trunk/src/ptlib/msos/mswin.cxx
    ptlib/trunk/src/ptlib/msos/pipe.cxx
    ptlib/trunk/src/ptlib/msos/ptlib.cxx
    ptlib/trunk/src/ptlib/msos/remconn.cxx
    ptlib/trunk/src/ptlib/msos/sound_directsound.cxx
    ptlib/trunk/src/ptlib/msos/sound_win32.cxx
    ptlib/trunk/src/ptlib/msos/svcproc.cxx
    ptlib/trunk/src/ptlib/msos/vfw.cxx
    ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
    ptlib/trunk/src/ptlib/msos/win32.cxx
    ptlib/trunk/src/ptlib/msos/wincfg.cxx
    ptlib/trunk/src/ptlib/msos/winserial.cxx
    ptlib/trunk/src/ptlib/msos/winsock.cxx
    ptlib/trunk/src/ptlib/unix/assert.cxx
    ptlib/trunk/src/ptlib/unix/beaudio.cxx
    ptlib/trunk/src/ptlib/unix/channel.cxx
    ptlib/trunk/src/ptlib/unix/config.cxx
    ptlib/trunk/src/ptlib/unix/dummyaudio.cxx
    ptlib/trunk/src/ptlib/unix/dummyvideo.cxx
    ptlib/trunk/src/ptlib/unix/maccoreaudio/circular_buffer.inl
    ptlib/trunk/src/ptlib/unix/maccoreaudio/mute_hack.inl
    ptlib/trunk/src/ptlib/unix/maccoreaudio.cxx
    ptlib/trunk/src/ptlib/unix/macosaudio/SoundMangler.cxx
    ptlib/trunk/src/ptlib/unix/macosaudio.cxx
    ptlib/trunk/src/ptlib/unix/ossaix.cxx
    ptlib/trunk/src/ptlib/unix/osutil.cxx
    ptlib/trunk/src/ptlib/unix/pipechan.cxx
    ptlib/trunk/src/ptlib/unix/qsa.cxx
    ptlib/trunk/src/ptlib/unix/remconn.cxx
    ptlib/trunk/src/ptlib/unix/serchan.cxx
    ptlib/trunk/src/ptlib/unix/shmvideo.cxx
    ptlib/trunk/src/ptlib/unix/socket.cxx
    ptlib/trunk/src/ptlib/unix/sunaudio.cxx
    ptlib/trunk/src/ptlib/unix/svcproc.cxx
    ptlib/trunk/src/ptlib/unix/switch.cxx
    ptlib/trunk/src/ptlib/unix/tlib.cxx
    ptlib/trunk/src/ptlib/unix/tlibbe.cxx
    ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx
    ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
    ptlib/trunk/src/ptlib/unix/tlibvx.cxx
    ptlib/trunk/src/ptlib/unix/udll.cxx
    ptlib/trunk/src/ptlib/unix/uicmp.cxx
    ptlib/trunk/src/ptlib/unix/video4beos.cxx
    ptlib/trunk/src/ptlib/unix/vxaudio.cxx
    ptlib/trunk/src/ptlib/wince/ConsoleCE/cevfw.cpp
    ptlib/trunk/src/ptlib/wince/ConsoleCE/snmpdummy.cpp
    ptlib/trunk/src/ptlib/wince/ConsoleCE/stdlibx.cpp
    ptlib/trunk/src/ptlib/wince/ConsoleCE/time.cpp
    ptlib/trunk/tools/MergeSym/MergeSym.cxx
    ptlib/trunk/tools/StringTest/main.cxx
    ptlib/trunk/tools/asnparser/main.cxx
    ptlib/trunk/tools/asnparser/main.h
    ptlib/trunk/tools/plugintest/main.cxx
    ptlib/trunk/version.h

Modified: ptlib/trunk/ReadMe_QOS.txt
===================================================================
--- ptlib/trunk/ReadMe_QOS.txt	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/ReadMe_QOS.txt	2007-11-29 09:17:41 UTC (rev 19008)
@@ -8,7 +8,7 @@
 ============
 Update 25.4.05:
 802.1p/q is now supported natively however is disabled 
-To enable set the Static PUDPSocket::disableQoS = FALSE;
+To enable set the Static PUDPSocket::disableQoS = PFalse;
 
 QoS support is now negotiated between the calling parties
 and will only functions when both parties have.

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/configure	2007-11-29 09:17:41 UTC (rev 19008)
@@ -1332,6 +1332,7 @@
   --enable-minsize        minimise the size of the lib by disabling least used options
   --enable-openh323       include only options needed with openh323
   --enable-opal           include only options needed with opal
+  --disable-ansi-bool     Use Windows-like integer BOOL over ANSI C++ bool
   --enable-internalregex  force internal regex library
   --enable-plugins        enable plugin support
   --disable-resolver      disable DNS resolver support
@@ -4869,6 +4870,26 @@
 
 
 
+# Check whether --enable-ansi-bool or --disable-ansi-bool was given.
+if test "${enable_ansi_bool+set}" = set; then
+  enableval="$enable_ansi_bool"
+
+fi;
+
+if test "${enable_ansi_bool}x" = "x" ; then
+  { echo "$as_me:$LINENO: Using ANSI C++ bool for PBoolean: (PFalse=false PTrue=true)" >&5
+echo "$as_me: Using ANSI C++ bool for PBoolean: (PFalse=false PTrue=true)" >&6;}
+  cat >>confdefs.h <<\_ACEOF
+#define P_USE_STANDARD_CXX_BOOL 1
+_ACEOF
+
+else
+  { echo "$as_me:$LINENO: Using Windows-like integer BOOL for PBoolean: (PFalse=0 PTrue=1)" >&5
+echo "$as_me: Using Windows-like integer BOOL for PBoolean: (PFalse=0 PTrue=1)" >&6;}
+fi
+
+
+
 P_HAS_RECVMSG=
 { echo "$as_me:$LINENO: checking for recvmsg" >&5
 echo $ECHO_N "checking for recvmsg... $ECHO_C" >&6; }

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/configure.ac	2007-11-29 09:17:41 UTC (rev 19008)
@@ -630,6 +630,23 @@
 
 
 dnl ########################################################################
+dnl check for Windows-like integer BOOL
+dnl
+dnl MSWIN_DISPLAY ansi-bool,ANSI C++ bool
+dnl MSWIN_DEFINE  ansi-bool,P_USE_STANDARD_CXX_BOOL
+
+AC_ARG_ENABLE(ansi-bool,
+       [  --disable-ansi-bool     Use Windows-like integer BOOL over ANSI C++ bool])
+
+if test "${enable_ansi_bool}x" = "x" ; then
+  AC_MSG_NOTICE(Using ANSI C++ bool for PBoolean: (PFalse=false PTrue=true))
+  AC_DEFINE(P_USE_STANDARD_CXX_BOOL)
+else
+  AC_MSG_NOTICE(Using Windows-like integer BOOL for PBoolean: (PFalse=0 PTrue=1))
+fi
+
+
+dnl ########################################################################
 dnl check for recvmsg
 
 P_HAS_RECVMSG=

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptbuildopts.h.in	2007-11-29 09:17:41 UTC (rev 19008)
@@ -576,6 +576,11 @@
 #undef  P_HAS_UPAD128_T
 #undef  P_HAS_INET_NTOP
 
+#undef  P_USE_STANDARD_CXX_BOOL
+#if !defined(P_USE_STANDARD_CXX_BOOL)
+#  define P_USE_INTEGER_BOOL
+#endif
+
 #endif // _PT_BUILDOPTS_H
 
 

Modified: ptlib/trunk/include/ptclib/asnber.h
===================================================================
--- ptlib/trunk/include/ptclib/asnber.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/asnber.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -21,49 +21,49 @@
 
     PBER_Stream & operator=(const PBYTEArray & bytes);
 
-    virtual BOOL Read(PChannel & chan);
-    virtual BOOL Write(PChannel & chan);
+    virtual PBoolean Read(PChannel & chan);
+    virtual PBoolean Write(PChannel & chan);
 
-    virtual BOOL NullDecode(PASN_Null &);
+    virtual PBoolean NullDecode(PASN_Null &);
     virtual void NullEncode(const PASN_Null &);
-    virtual BOOL BooleanDecode(PASN_Boolean &);
+    virtual PBoolean BooleanDecode(PASN_Boolean &);
     virtual void BooleanEncode(const PASN_Boolean &);
-    virtual BOOL IntegerDecode(PASN_Integer &);
+    virtual PBoolean IntegerDecode(PASN_Integer &);
     virtual void IntegerEncode(const PASN_Integer &);
-    virtual BOOL EnumerationDecode(PASN_Enumeration &);
+    virtual PBoolean EnumerationDecode(PASN_Enumeration &);
     virtual void EnumerationEncode(const PASN_Enumeration &);
-    virtual BOOL RealDecode(PASN_Real &);
+    virtual PBoolean RealDecode(PASN_Real &);
     virtual void RealEncode(const PASN_Real &);
-    virtual BOOL ObjectIdDecode(PASN_ObjectId &);
+    virtual PBoolean ObjectIdDecode(PASN_ObjectId &);
     virtual void ObjectIdEncode(const PASN_ObjectId &);
-    virtual BOOL BitStringDecode(PASN_BitString &);
+    virtual PBoolean BitStringDecode(PASN_BitString &);
     virtual void BitStringEncode(const PASN_BitString &);
-    virtual BOOL OctetStringDecode(PASN_OctetString &);
+    virtual PBoolean OctetStringDecode(PASN_OctetString &);
     virtual void OctetStringEncode(const PASN_OctetString &);
-    virtual BOOL ConstrainedStringDecode(PASN_ConstrainedString &);
+    virtual PBoolean ConstrainedStringDecode(PASN_ConstrainedString &);
     virtual void ConstrainedStringEncode(const PASN_ConstrainedString &);
-    virtual BOOL BMPStringDecode(PASN_BMPString &);
+    virtual PBoolean BMPStringDecode(PASN_BMPString &);
     virtual void BMPStringEncode(const PASN_BMPString &);
-    virtual BOOL ChoiceDecode(PASN_Choice &);
+    virtual PBoolean ChoiceDecode(PASN_Choice &);
     virtual void ChoiceEncode(const PASN_Choice &);
-    virtual BOOL ArrayDecode(PASN_Array &);
+    virtual PBoolean ArrayDecode(PASN_Array &);
     virtual void ArrayEncode(const PASN_Array &);
-    virtual BOOL SequencePreambleDecode(PASN_Sequence &);
+    virtual PBoolean SequencePreambleDecode(PASN_Sequence &);
     virtual void SequencePreambleEncode(const PASN_Sequence &);
-    virtual BOOL SequenceKnownDecode(PASN_Sequence &, PINDEX, PASN_Object &);
+    virtual PBoolean SequenceKnownDecode(PASN_Sequence &, PINDEX, PASN_Object &);
     virtual void SequenceKnownEncode(const PASN_Sequence &, PINDEX, const PASN_Object &);
-    virtual BOOL SequenceUnknownDecode(PASN_Sequence &);
+    virtual PBoolean SequenceUnknownDecode(PASN_Sequence &);
     virtual void SequenceUnknownEncode(const PASN_Sequence &);
 
     virtual PASN_Object * CreateObject(unsigned tag,
                                        PASN_Object::TagClass tagClass,
-                                       BOOL primitive) const;
+                                       PBoolean primitive) const;
 
-    BOOL HeaderDecode(unsigned & tagVal,
+    PBoolean HeaderDecode(unsigned & tagVal,
                       PASN_Object::TagClass & tagClass,
-                      BOOL & primitive,
+                      PBoolean & primitive,
                       unsigned & len);
-    BOOL HeaderDecode(PASN_Object & obj, unsigned & len);
+    PBoolean HeaderDecode(PASN_Object & obj, unsigned & len);
     void HeaderEncode(const PASN_Object & obj);
 };
 

Modified: ptlib/trunk/include/ptclib/asner.h
===================================================================
--- ptlib/trunk/include/ptclib/asner.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/asner.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -68,13 +68,13 @@
 
     PINDEX GetObjectLength() const;
     virtual PINDEX GetDataLength() const = 0;
-    virtual BOOL IsPrimitive() const { return TRUE; }
+    virtual PBoolean IsPrimitive() const { return PTrue; }
 
-    virtual BOOL Decode(PASN_Stream &) = 0;
+    virtual PBoolean Decode(PASN_Stream &) = 0;
     virtual void Encode(PASN_Stream &) const = 0;
 
-    BOOL IsExtendable() const { return extendable; }
-    void SetExtendable(BOOL ext = TRUE) { extendable = ext; }
+    PBoolean IsExtendable() const { return extendable; }
+    void SetExtendable(PBoolean ext = PTrue) { extendable = ext; }
 
     enum TagClass {
       UniversalTagClass,
@@ -148,10 +148,10 @@
     static void SetMaximumStringSize(PINDEX sz);
 
   protected:
-    PASN_Object(unsigned tag, TagClass tagClass, BOOL extend = FALSE);
+    PASN_Object(unsigned tag, TagClass tagClass, PBoolean extend = PFalse);
 
     /// PER extension capability
-    BOOL extendable;
+    PBoolean extendable;
     /// BER tag class
     TagClass tagClass;
     /// ASN object tag
@@ -165,14 +165,14 @@
 {
     PCLASSINFO(PASN_ConstrainedObject, PASN_Object);
   public:
-    BOOL IsConstrained() const { return constraint != Unconstrained; }
+    PBoolean IsConstrained() const { return constraint != Unconstrained; }
     int GetLowerLimit() const { return lowerLimit; }
     unsigned GetUpperLimit() const { return upperLimit; }
 
-    BOOL ConstrainedLengthDecode(PPER_Stream & strm, unsigned & length);
+    PBoolean ConstrainedLengthDecode(PPER_Stream & strm, unsigned & length);
     void ConstrainedLengthEncode(PPER_Stream & strm, unsigned length) const;
 
-    BOOL ConstraintEncode(PPER_Stream & strm, unsigned value) const;
+    PBoolean ConstraintEncode(PPER_Stream & strm, unsigned value) const;
 
   protected:
     virtual void SetConstraintBounds(ConstraintType type, int lower, unsigned upper);
@@ -199,7 +199,7 @@
 
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 };
 
@@ -210,13 +210,13 @@
 {
     PCLASSINFO(PASN_Boolean, PASN_Object);
   public:
-    PASN_Boolean(BOOL val = FALSE);
-    PASN_Boolean(unsigned tag, TagClass tagClass, BOOL val = FALSE);
+    PASN_Boolean(PBoolean val = PFalse);
+    PASN_Boolean(unsigned tag, TagClass tagClass, PBoolean val = PFalse);
 
-    PASN_Boolean & operator=(BOOL v) { value = v; return *this; }
-    operator BOOL() const { return value; }
-    BOOL GetValue() const { return value; }
-    void SetValue(BOOL v) { value = v; }
+    PASN_Boolean & operator=(PBoolean v) { value = v; return *this; }
+    operator PBoolean() const { return value; }
+    PBoolean GetValue() const { return value; }
+    void SetValue(PBoolean v) { value = v; }
 
     virtual Comparison Compare(const PObject & obj) const;
     virtual PObject * Clone() const;
@@ -224,11 +224,11 @@
 
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
   protected:
-    BOOL value;
+    PBoolean value;
 };
 
 
@@ -253,15 +253,15 @@
     virtual void SetConstraintBounds(ConstraintType type, int lower, unsigned upper);
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
 #ifdef P_INCLUDE_PER
-    BOOL DecodePER(PPER_Stream & strm);
+    PBoolean DecodePER(PPER_Stream & strm);
     void EncodePER(PPER_Stream & strm) const;
 #endif
 
-    BOOL IsUnsigned() const;
+    PBoolean IsUnsigned() const;
 
   protected:
     unsigned value;
@@ -282,12 +282,12 @@
     PASN_Enumeration(unsigned tag,
                      TagClass tagClass,
                      unsigned nEnums = P_MAX_INDEX,
-                     BOOL extendable = FALSE,
+                     PBoolean extendable = PFalse,
                      unsigned val = 0);
     PASN_Enumeration(unsigned tag,
                      TagClass tagClass,
                      unsigned nEnums,
-                     BOOL extendable,
+                     PBoolean extendable,
                      const PASN_Names * nameSpec,
                      unsigned namesCnt,
                      unsigned val = 0);
@@ -305,16 +305,16 @@
 
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
 #ifdef P_INCLUDE_PER
-    BOOL DecodePER(PPER_Stream & strm);
+    PBoolean DecodePER(PPER_Stream & strm);
     void EncodePER(PPER_Stream & strm) const;
 #endif
 
 #ifdef P_INCLUDE_XER
-    virtual BOOL DecodeXER(PXER_Stream & strm);
+    virtual PBoolean DecodeXER(PXER_Stream & strm);
     virtual void EncodeXER(PXER_Stream & strm) const;
 #endif
 
@@ -347,7 +347,7 @@
 
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
   protected:
@@ -391,10 +391,10 @@
 
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
-    BOOL CommonDecode(PASN_Stream & strm, unsigned dataLen);
+    PBoolean CommonDecode(PASN_Stream & strm, unsigned dataLen);
     void CommonEncode(PBYTEArray & eObjId) const;
 
   protected:
@@ -420,7 +420,7 @@
     const BYTE * GetDataPointer() const { return bitData; }
 
     unsigned GetSize() const { return totalBits; }
-    BOOL SetSize(unsigned nBits);
+    PBoolean SetSize(unsigned nBits);
 
     bool operator[](PINDEX bit) const;
     void Set(unsigned bit);
@@ -434,20 +434,20 @@
     virtual void SetConstraintBounds(ConstraintType type, int lower, unsigned upper);
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
 #ifdef P_INCLUDE_BER
-    BOOL DecodeBER(PBER_Stream & strm, unsigned len);
+    PBoolean DecodeBER(PBER_Stream & strm, unsigned len);
     void EncodeBER(PBER_Stream & strm) const;
 #endif
 
 #ifdef P_INCLUDE_PER
-    BOOL DecodePER(PPER_Stream & strm);
+    PBoolean DecodePER(PPER_Stream & strm);
     void EncodePER(PPER_Stream & strm) const;
 #endif
 
-    BOOL DecodeSequenceExtensionBitmap(PPER_Stream & strm);
+    PBoolean DecodeSequenceExtensionBitmap(PPER_Stream & strm);
     void EncodeSequenceExtensionBitmap(PPER_Stream & strm) const;
 
   protected:
@@ -483,7 +483,7 @@
     BYTE & operator[](PINDEX i) { return value[i]; }
     BYTE * GetPointer(PINDEX sz = 0) { return value.GetPointer(sz); }
     PINDEX GetSize() const { return value.GetSize(); }
-    BOOL SetSize(PINDEX newSize);
+    PBoolean SetSize(PINDEX newSize);
 
     virtual Comparison Compare(const PObject & obj) const;
     virtual PObject * Clone() const;
@@ -492,15 +492,15 @@
     virtual void SetConstraintBounds(ConstraintType type, int lower, unsigned upper);
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
 #ifdef P_INCLUDE_PER
-    BOOL DecodePER(PPER_Stream & strm);
+    PBoolean DecodePER(PPER_Stream & strm);
     void EncodePER(PPER_Stream & strm) const;
 #endif
 
-    BOOL DecodeSubType(PASN_Object &) const;
+    PBoolean DecodeSubType(PASN_Object &) const;
     void EncodeSubType(const PASN_Object &);
 
   protected:
@@ -531,16 +531,16 @@
 
     virtual void SetConstraintBounds(ConstraintType type, int lower, unsigned upper);
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
 #ifdef P_INCLUDE_BER
-    BOOL DecodeBER(PBER_Stream & strm, unsigned len);
+    PBoolean DecodeBER(PBER_Stream & strm, unsigned len);
     void EncodeBER(PBER_Stream & strm) const;
 #endif
 
 #ifdef P_INCLUDE_PER
-    BOOL DecodePER(PPER_Stream & strm);
+    PBoolean DecodePER(PPER_Stream & strm);
     void EncodePER(PPER_Stream & strm) const;
 #endif
 
@@ -612,22 +612,22 @@
 
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
 #ifdef P_INCLUDE_BER
-    BOOL DecodeBER(PBER_Stream & strm, unsigned len);
+    PBoolean DecodeBER(PBER_Stream & strm, unsigned len);
     void EncodeBER(PBER_Stream & strm) const;
 #endif
 
 #ifdef P_INCLUDE_PER
-    BOOL DecodePER(PPER_Stream & strm);
+    PBoolean DecodePER(PPER_Stream & strm);
     void EncodePER(PPER_Stream & strm) const;
 #endif
 
   protected:
     void Construct();
-    BOOL IsLegalCharacter(WORD ch);
+    PBoolean IsLegalCharacter(WORD ch);
 
     PWCharArray value;
     PWCharArray characterSet;
@@ -684,7 +684,7 @@
     virtual void SetTag(unsigned newTag, TagClass tagClass = DefaultTagClass);
     PString GetTagName() const;
     PASN_Object & GetObject() const;
-    BOOL IsValid() const { return choice != NULL; }
+    PBoolean IsValid() const { return choice != NULL; }
 
 #if defined(__GNUC__) && __GNUC__ <= 2 && __GNUC_MINOR__ < 9
 
@@ -740,24 +740,24 @@
 
 #endif
 
-    virtual BOOL CreateObject() = 0;
+    virtual PBoolean CreateObject() = 0;
 
     virtual Comparison Compare(const PObject & obj) const;
     virtual void PrintOn(ostream & strm) const;
 
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL IsPrimitive() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean IsPrimitive() const;
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
 #ifdef P_INCLUDE_PER
-    virtual BOOL DecodePER(PPER_Stream &);
+    virtual PBoolean DecodePER(PPER_Stream &);
     virtual void EncodePER(PPER_Stream &) const;
 #endif
 
 #ifdef P_INCLUDE_XER
-    BOOL DecodeXER(PXER_Stream &);
+    PBoolean DecodeXER(PXER_Stream &);
     void EncodeXER(PXER_Stream &) const;
 #endif
 
@@ -765,13 +765,13 @@
 
     PINDEX GetValueByName(PString name) const;
   protected:
-    PASN_Choice(unsigned nChoices = 0, BOOL extend = FALSE);
-    PASN_Choice(unsigned tag, TagClass tagClass, unsigned nChoices, BOOL extend);
-    PASN_Choice(unsigned tag, TagClass tagClass, unsigned nChoices, BOOL extend, const PASN_Names * nameSpec,unsigned namesCnt);
+    PASN_Choice(unsigned nChoices = 0, PBoolean extend = PFalse);
+    PASN_Choice(unsigned tag, TagClass tagClass, unsigned nChoices, PBoolean extend);
+    PASN_Choice(unsigned tag, TagClass tagClass, unsigned nChoices, PBoolean extend, const PASN_Names * nameSpec,unsigned namesCnt);
 
     PASN_Choice(const PASN_Choice & other);
 
-    BOOL CheckCreate() const;
+    PBoolean CheckCreate() const;
 
     unsigned numChoices;
     PASN_Object * choice;
@@ -791,16 +791,16 @@
   public:
     PASN_Sequence(unsigned tag = UniversalSequence,
                   TagClass tagClass = UniversalTagClass,
-                  unsigned nOpts = 0, BOOL extend = FALSE, unsigned nExtend = 0);
+                  unsigned nOpts = 0, PBoolean extend = PFalse, unsigned nExtend = 0);
 
     PASN_Sequence(const PASN_Sequence & other);
     PASN_Sequence & operator=(const PASN_Sequence & other);
 
     PINDEX GetSize() const { return fields.GetSize(); }
-    BOOL SetSize(PINDEX newSize);
+    PBoolean SetSize(PINDEX newSize);
     PASN_Object & operator[](PINDEX i) const { return fields[i]; }
 
-    BOOL HasOptionalField(PINDEX opt) const;
+    PBoolean HasOptionalField(PINDEX opt) const;
     void IncludeOptionalField(PINDEX opt);
     void RemoveOptionalField(PINDEX opt);
 
@@ -810,47 +810,47 @@
 
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL IsPrimitive() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean IsPrimitive() const;
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
-    BOOL PreambleDecode(PASN_Stream & strm);
+    PBoolean PreambleDecode(PASN_Stream & strm);
     void PreambleEncode(PASN_Stream & strm) const;
-    BOOL KnownExtensionDecode(PASN_Stream & strm, PINDEX fld, PASN_Object & field);
+    PBoolean KnownExtensionDecode(PASN_Stream & strm, PINDEX fld, PASN_Object & field);
     void KnownExtensionEncode(PASN_Stream & strm, PINDEX fld, const PASN_Object & field) const;
-    BOOL UnknownExtensionsDecode(PASN_Stream & strm);
+    PBoolean UnknownExtensionsDecode(PASN_Stream & strm);
     void UnknownExtensionsEncode(PASN_Stream & strm) const;
 
 #ifdef P_INCLUDE_BER
-    BOOL PreambleDecodeBER(PBER_Stream & strm);
+    PBoolean PreambleDecodeBER(PBER_Stream & strm);
     void PreambleEncodeBER(PBER_Stream & strm) const;
-    BOOL KnownExtensionDecodeBER(PBER_Stream & strm, PINDEX fld, PASN_Object & field);
+    PBoolean KnownExtensionDecodeBER(PBER_Stream & strm, PINDEX fld, PASN_Object & field);
     void KnownExtensionEncodeBER(PBER_Stream & strm, PINDEX fld, const PASN_Object & field) const;
-    BOOL UnknownExtensionsDecodeBER(PBER_Stream & strm);
+    PBoolean UnknownExtensionsDecodeBER(PBER_Stream & strm);
     void UnknownExtensionsEncodeBER(PBER_Stream & strm) const;
 #endif
 
 #ifdef P_INCLUDE_PER
-    BOOL PreambleDecodePER(PPER_Stream & strm);
+    PBoolean PreambleDecodePER(PPER_Stream & strm);
     void PreambleEncodePER(PPER_Stream & strm) const;
-    BOOL KnownExtensionDecodePER(PPER_Stream & strm, PINDEX fld, PASN_Object & field);
+    PBoolean KnownExtensionDecodePER(PPER_Stream & strm, PINDEX fld, PASN_Object & field);
     void KnownExtensionEncodePER(PPER_Stream & strm, PINDEX fld, const PASN_Object & field) const;
-    BOOL UnknownExtensionsDecodePER(PPER_Stream & strm);
+    PBoolean UnknownExtensionsDecodePER(PPER_Stream & strm);
     void UnknownExtensionsEncodePER(PPER_Stream & strm) const;
 #endif
 
 #ifdef P_INCLUDE_XER
-    virtual BOOL PreambleDecodeXER(PXER_Stream & strm);
+    virtual PBoolean PreambleDecodeXER(PXER_Stream & strm);
     virtual void PreambleEncodeXER(PXER_Stream & strm) const;
-    virtual BOOL KnownExtensionDecodeXER(PXER_Stream & strm, PINDEX fld, PASN_Object & field);
+    virtual PBoolean KnownExtensionDecodeXER(PXER_Stream & strm, PINDEX fld, PASN_Object & field);
     virtual void KnownExtensionEncodeXER(PXER_Stream & strm, PINDEX fld, const PASN_Object & field) const;
-    virtual BOOL UnknownExtensionsDecodeXER(PXER_Stream & strm);
+    virtual PBoolean UnknownExtensionsDecodeXER(PXER_Stream & strm);
     virtual void UnknownExtensionsEncodeXER(PXER_Stream & strm) const;
 #endif
 
   protected:
-    BOOL NoExtensionsToDecode(PPER_Stream & strm);
-    BOOL NoExtensionsToEncode(PPER_Stream & strm);
+    PBoolean NoExtensionsToDecode(PPER_Stream & strm);
+    PBoolean NoExtensionsToEncode(PPER_Stream & strm);
 
     PASN_ObjectArray fields;
     PASN_BitString optionMap;
@@ -869,7 +869,7 @@
   public:
     PASN_Set(unsigned tag = UniversalSet,
              TagClass tagClass = UniversalTagClass,
-             unsigned nOpts = 0, BOOL extend = FALSE, unsigned nExtend = 0);
+             unsigned nOpts = 0, PBoolean extend = PFalse, unsigned nExtend = 0);
 
     virtual PObject * Clone() const;
     virtual PString GetTypeAsString() const;
@@ -883,7 +883,7 @@
     PCLASSINFO(PASN_Array, PASN_ConstrainedObject);
   public:
     PINDEX GetSize() const { return array.GetSize(); }
-    BOOL SetSize(PINDEX newSize);
+    PBoolean SetSize(PINDEX newSize);
     PASN_Object & operator[](PINDEX i) const { return array[i]; }
     void Append(PASN_Object * obj) { array.SetAt(array.GetSize(), obj); }
     void RemoveAt(PINDEX i) { array.RemoveAt(i); }
@@ -895,8 +895,8 @@
     virtual void SetConstraintBounds(ConstraintType type, int lower, unsigned upper);
     virtual PString GetTypeAsString() const;
     virtual PINDEX GetDataLength() const;
-    virtual BOOL IsPrimitive() const;
-    virtual BOOL Decode(PASN_Stream &);
+    virtual PBoolean IsPrimitive() const;
+    virtual PBoolean Decode(PASN_Stream &);
     virtual void Encode(PASN_Stream &) const;
 
     virtual PASN_Object * CreateObject() const = 0;
@@ -929,43 +929,43 @@
 
     PINDEX GetPosition() const { return byteOffset; }
     void SetPosition(PINDEX newPos);
-    BOOL IsAtEnd() { return byteOffset >= GetSize(); }
+    PBoolean IsAtEnd() { return byteOffset >= GetSize(); }
     void ResetDecoder();
     void BeginEncoding();
     void CompleteEncoding();
 
-    virtual BOOL Read(PChannel & chan) = 0;
-    virtual BOOL Write(PChannel & chan) = 0;
+    virtual PBoolean Read(PChannel & chan) = 0;
+    virtual PBoolean Write(PChannel & chan) = 0;
 
-    virtual BOOL NullDecode(PASN_Null &) = 0;
+    virtual PBoolean NullDecode(PASN_Null &) = 0;
     virtual void NullEncode(const PASN_Null &) = 0;
-    virtual BOOL BooleanDecode(PASN_Boolean &) = 0;
+    virtual PBoolean BooleanDecode(PASN_Boolean &) = 0;
     virtual void BooleanEncode(const PASN_Boolean &) = 0;
-    virtual BOOL IntegerDecode(PASN_Integer &) = 0;
+    virtual PBoolean IntegerDecode(PASN_Integer &) = 0;
     virtual void IntegerEncode(const PASN_Integer &) = 0;
-    virtual BOOL EnumerationDecode(PASN_Enumeration &) = 0;
+    virtual PBoolean EnumerationDecode(PASN_Enumeration &) = 0;
     virtual void EnumerationEncode(const PASN_Enumeration &) = 0;
-    virtual BOOL RealDecode(PASN_Real &) = 0;
+    virtual PBoolean RealDecode(PASN_Real &) = 0;
     virtual void RealEncode(const PASN_Real &) = 0;
-    virtual BOOL ObjectIdDecode(PASN_ObjectId &) = 0;
+    virtual PBoolean ObjectIdDecode(PASN_ObjectId &) = 0;
     virtual void ObjectIdEncode(const PASN_ObjectId &) = 0;
-    virtual BOOL BitStringDecode(PASN_BitString &) = 0;
+    virtual PBoolean BitStringDecode(PASN_BitString &) = 0;
     virtual void BitStringEncode(const PASN_BitString &) = 0;
-    virtual BOOL OctetStringDecode(PASN_OctetString &) = 0;
+    virtual PBoolean OctetStringDecode(PASN_OctetString &) = 0;
     virtual void OctetStringEncode(const PASN_OctetString &) = 0;
-    virtual BOOL ConstrainedStringDecode(PASN_ConstrainedString &) = 0;
+    virtual PBoolean ConstrainedStringDecode(PASN_ConstrainedString &) = 0;
     virtual void ConstrainedStringEncode(const PASN_ConstrainedString &) = 0;
-    virtual BOOL BMPStringDecode(PASN_BMPString &) = 0;
+    virtual PBoolean BMPStringDecode(PASN_BMPString &) = 0;
     virtual void BMPStringEncode(const PASN_BMPString &) = 0;
-    virtual BOOL ChoiceDecode(PASN_Choice &) = 0;
+    virtual PBoolean ChoiceDecode(PASN_Choice &) = 0;
     virtual void ChoiceEncode(const PASN_Choice &) = 0;
-    virtual BOOL ArrayDecode(PASN_Array &) = 0;
+    virtual PBoolean ArrayDecode(PASN_Array &) = 0;
     virtual void ArrayEncode(const PASN_Array &) = 0;
-    virtual BOOL SequencePreambleDecode(PASN_Sequence &) = 0;
+    virtual PBoolean SequencePreambleDecode(PASN_Sequence &) = 0;
     virtual void SequencePreambleEncode(const PASN_Sequence &) = 0;
-    virtual BOOL SequenceKnownDecode(PASN_Sequence &, PINDEX, PASN_Object &) = 0;
+    virtual PBoolean SequenceKnownDecode(PASN_Sequence &, PINDEX, PASN_Object &) = 0;
     virtual void SequenceKnownEncode(const PASN_Sequence &, PINDEX, const PASN_Object &) = 0;
-    virtual BOOL SequenceUnknownDecode(PASN_Sequence &) = 0;
+    virtual PBoolean SequenceUnknownDecode(PASN_Sequence &) = 0;
     virtual void SequenceUnknownEncode(const PASN_Sequence &) = 0;
 
     BYTE ByteDecode();

Modified: ptlib/trunk/include/ptclib/asnper.h
===================================================================
--- ptlib/trunk/include/ptclib/asnper.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/asnper.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -9,75 +9,76 @@
 
 #ifdef P_INCLUDE_PER
 
+
 /** Class for ASN Packed Encoding Rules stream.
 */
 class PPER_Stream : public PASN_Stream
 {
     PCLASSINFO(PPER_Stream, PASN_Stream);
   public:
-    PPER_Stream(BOOL aligned = TRUE);
-    PPER_Stream(const PBYTEArray & bytes, BOOL aligned = TRUE);
-    PPER_Stream(const BYTE * buf, PINDEX size, BOOL aligned = TRUE);
+    PPER_Stream(int aligned = PTrue);
+    PPER_Stream(const BYTE * buf, PINDEX size, PBoolean aligned = PTrue);
+    PPER_Stream(const PBYTEArray & bytes, PBoolean aligned = PTrue);
 
     PPER_Stream & operator=(const PBYTEArray & bytes);
 
     unsigned GetBitsLeft() const;
 
-    virtual BOOL Read(PChannel & chan);
-    virtual BOOL Write(PChannel & chan);
+    virtual PBoolean Read(PChannel & chan);
+    virtual PBoolean Write(PChannel & chan);
 
-    virtual BOOL NullDecode(PASN_Null &);
+    virtual PBoolean NullDecode(PASN_Null &);
     virtual void NullEncode(const PASN_Null &);
-    virtual BOOL BooleanDecode(PASN_Boolean &);
+    virtual PBoolean BooleanDecode(PASN_Boolean &);
     virtual void BooleanEncode(const PASN_Boolean &);
-    virtual BOOL IntegerDecode(PASN_Integer &);
+    virtual PBoolean IntegerDecode(PASN_Integer &);
     virtual void IntegerEncode(const PASN_Integer &);
-    virtual BOOL EnumerationDecode(PASN_Enumeration &);
+    virtual PBoolean EnumerationDecode(PASN_Enumeration &);
     virtual void EnumerationEncode(const PASN_Enumeration &);
-    virtual BOOL RealDecode(PASN_Real &);
+    virtual PBoolean RealDecode(PASN_Real &);
     virtual void RealEncode(const PASN_Real &);
-    virtual BOOL ObjectIdDecode(PASN_ObjectId &);
+    virtual PBoolean ObjectIdDecode(PASN_ObjectId &);
     virtual void ObjectIdEncode(const PASN_ObjectId &);
-    virtual BOOL BitStringDecode(PASN_BitString &);
+    virtual PBoolean BitStringDecode(PASN_BitString &);
     virtual void BitStringEncode(const PASN_BitString &);
-    virtual BOOL OctetStringDecode(PASN_OctetString &);
+    virtual PBoolean OctetStringDecode(PASN_OctetString &);
     virtual void OctetStringEncode(const PASN_OctetString &);
-    virtual BOOL ConstrainedStringDecode(PASN_ConstrainedString &);
+    virtual PBoolean ConstrainedStringDecode(PASN_ConstrainedString &);
     virtual void ConstrainedStringEncode(const PASN_ConstrainedString &);
-    virtual BOOL BMPStringDecode(PASN_BMPString &);
+    virtual PBoolean BMPStringDecode(PASN_BMPString &);
     virtual void BMPStringEncode(const PASN_BMPString &);
-    virtual BOOL ChoiceDecode(PASN_Choice &);
+    virtual PBoolean ChoiceDecode(PASN_Choice &);
     virtual void ChoiceEncode(const PASN_Choice &);
-    virtual BOOL ArrayDecode(PASN_Array &);
+    virtual PBoolean ArrayDecode(PASN_Array &);
     virtual void ArrayEncode(const PASN_Array &);
-    virtual BOOL SequencePreambleDecode(PASN_Sequence &);
+    virtual PBoolean SequencePreambleDecode(PASN_Sequence &);
     virtual void SequencePreambleEncode(const PASN_Sequence &);
-    virtual BOOL SequenceKnownDecode(PASN_Sequence &, PINDEX, PASN_Object &);
+    virtual PBoolean SequenceKnownDecode(PASN_Sequence &, PINDEX, PASN_Object &);
     virtual void SequenceKnownEncode(const PASN_Sequence &, PINDEX, const PASN_Object &);
-    virtual BOOL SequenceUnknownDecode(PASN_Sequence &);
+    virtual PBoolean SequenceUnknownDecode(PASN_Sequence &);
     virtual void SequenceUnknownEncode(const PASN_Sequence &);
 
-    BOOL IsAligned() const { return aligned; }
+    PBoolean IsAligned() const { return aligned; }
 
-    BOOL SingleBitDecode();
-    void SingleBitEncode(BOOL value);
+    PBoolean SingleBitDecode();
+    void SingleBitEncode(PBoolean value);
 
-    BOOL MultiBitDecode(unsigned nBits, unsigned & value);
+    PBoolean MultiBitDecode(unsigned nBits, unsigned & value);
     void MultiBitEncode(unsigned value, unsigned nBits);
 
-    BOOL SmallUnsignedDecode(unsigned & value);
+    PBoolean SmallUnsignedDecode(unsigned & value);
     void SmallUnsignedEncode(unsigned value);
 
-    BOOL LengthDecode(unsigned lower, unsigned upper, unsigned & len);
+    PBoolean LengthDecode(unsigned lower, unsigned upper, unsigned & len);
     void LengthEncode(unsigned len, unsigned lower, unsigned upper);
 
-    BOOL UnsignedDecode(unsigned lower, unsigned upper, unsigned & value);
+    PBoolean UnsignedDecode(unsigned lower, unsigned upper, unsigned & value);
     void UnsignedEncode(int value, unsigned lower, unsigned upper);
 
     void AnyTypeEncode(const PASN_Object * value);
 
   protected:
-    BOOL aligned;
+    PBoolean aligned;
 };
 
 #endif

Modified: ptlib/trunk/include/ptclib/asnxer.h
===================================================================
--- ptlib/trunk/include/ptclib/asnxer.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/asnxer.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -19,38 +19,38 @@
     PXER_Stream(PXMLElement * elem, const PBYTEArray & bytes);
     PXER_Stream(PXMLElement * elem, const BYTE * buf, PINDEX size);
 
-    virtual BOOL Read(PChannel & chan);
-    virtual BOOL Write(PChannel & chan);
+    virtual PBoolean Read(PChannel & chan);
+    virtual PBoolean Write(PChannel & chan);
 
-    virtual BOOL NullDecode(PASN_Null &);
+    virtual PBoolean NullDecode(PASN_Null &);
     virtual void NullEncode(const PASN_Null &);
-    virtual BOOL BooleanDecode(PASN_Boolean &);
+    virtual PBoolean BooleanDecode(PASN_Boolean &);
     virtual void BooleanEncode(const PASN_Boolean &);
-    virtual BOOL IntegerDecode(PASN_Integer &);
+    virtual PBoolean IntegerDecode(PASN_Integer &);
     virtual void IntegerEncode(const PASN_Integer &);
-    virtual BOOL EnumerationDecode(PASN_Enumeration &);
+    virtual PBoolean EnumerationDecode(PASN_Enumeration &);
     virtual void EnumerationEncode(const PASN_Enumeration &);
-    virtual BOOL RealDecode(PASN_Real &);
+    virtual PBoolean RealDecode(PASN_Real &);
     virtual void RealEncode(const PASN_Real &);
-    virtual BOOL ObjectIdDecode(PASN_ObjectId &);
+    virtual PBoolean ObjectIdDecode(PASN_ObjectId &);
     virtual void ObjectIdEncode(const PASN_ObjectId &);
-    virtual BOOL BitStringDecode(PASN_BitString &);
+    virtual PBoolean BitStringDecode(PASN_BitString &);
     virtual void BitStringEncode(const PASN_BitString &);
-    virtual BOOL OctetStringDecode(PASN_OctetString &);
+    virtual PBoolean OctetStringDecode(PASN_OctetString &);
     virtual void OctetStringEncode(const PASN_OctetString &);
-    virtual BOOL ConstrainedStringDecode(PASN_ConstrainedString &);
+    virtual PBoolean ConstrainedStringDecode(PASN_ConstrainedString &);
     virtual void ConstrainedStringEncode(const PASN_ConstrainedString &);
-    virtual BOOL BMPStringDecode(PASN_BMPString &);
+    virtual PBoolean BMPStringDecode(PASN_BMPString &);
     virtual void BMPStringEncode(const PASN_BMPString &);
-    virtual BOOL ChoiceDecode(PASN_Choice &);
+    virtual PBoolean ChoiceDecode(PASN_Choice &);
     virtual void ChoiceEncode(const PASN_Choice &);
-    virtual BOOL ArrayDecode(PASN_Array &);
+    virtual PBoolean ArrayDecode(PASN_Array &);
     virtual void ArrayEncode(const PASN_Array &);
-    virtual BOOL SequencePreambleDecode(PASN_Sequence &);
+    virtual PBoolean SequencePreambleDecode(PASN_Sequence &);
     virtual void SequencePreambleEncode(const PASN_Sequence &);
-    virtual BOOL SequenceKnownDecode(PASN_Sequence &, PINDEX, PASN_Object &);
+    virtual PBoolean SequenceKnownDecode(PASN_Sequence &, PINDEX, PASN_Object &);
     virtual void SequenceKnownEncode(const PASN_Sequence &, PINDEX, const PASN_Object &);
-    virtual BOOL SequenceUnknownDecode(PASN_Sequence &);
+    virtual PBoolean SequenceUnknownDecode(PASN_Sequence &);
     virtual void SequenceUnknownEncode(const PASN_Sequence &);
 
     PXMLElement * GetCurrentElement()                   { return position; }

Modified: ptlib/trunk/include/ptclib/cypher.h
===================================================================
--- ptlib/trunk/include/ptclib/cypher.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/cypher.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -81,7 +81,7 @@
     PBase64();
 
     void StartEncoding(
-      BOOL useCRLFs = TRUE  // Use CR, LF pairs in end of line characters.
+      PBoolean useCRLFs = PTrue  // Use CR, LF pairs in end of line characters.
     );
     // Begin a base 64 encoding operation, initialising the object instance.
 
@@ -139,12 +139,12 @@
     /** Incorporate the specified data into the base 64 decoding.
     
        @return
-       TRUE if block was last in the Base64 encoded string.
+       PTrue if block was last in the Base64 encoded string.
      */
-    BOOL ProcessDecoding(
+    PBoolean ProcessDecoding(
       const PString & str      // String to be encoded
     );
-    BOOL ProcessDecoding(
+    PBoolean ProcessDecoding(
       const char * cstr        // C String to be encoded
     );
 
@@ -153,7 +153,7 @@
        @return
        Decoded data for the processed Base64 string.
      */
-    BOOL GetDecodedData(
+    PBoolean GetDecodedData(
       void * dataBlock,    // Pointer to data to be decoded from base64
       PINDEX length        // Length of the data block.
     );
@@ -166,14 +166,14 @@
        @return
        Decoded data for the processed Base64 string.
      */
-    BOOL IsDecodeOK() { return perfectDecode; }
+    PBoolean IsDecodeOK() { return perfectDecode; }
 
 
     /** Convert a printable text string to binary data using the Internet MIME
        standard base 64 content transfer encoding.
 
-       The base64 string is checked and TRUE returned if all perfectly correct.
-       If FALSE is returned then the string had extraneous or illegal
+       The base64 string is checked and PTrue returned if all perfectly correct.
+       If PFalse is returned then the string had extraneous or illegal
        characters in it that were ignored. This does not mean that the data is
        not valid, only that it is suspect.
     
@@ -183,11 +183,11 @@
     static PString Decode(
       const PString & str // Encoded base64 string to be decoded.
     );
-    static BOOL Decode(
+    static PBoolean Decode(
       const PString & str, // Encoded base64 string to be decoded.
       PBYTEArray & data    // Converted binary data from base64.
     );
-    static BOOL Decode(
+    static PBoolean Decode(
       const PString & str, // Encoded base64 string to be decoded.
       void * dataBlock,    // Pointer to data to be decoded from base64
       PINDEX length        // Length of the data block.
@@ -203,9 +203,9 @@
     BYTE    saveTriple[3];
     PINDEX  saveCount;
     PINDEX  nextLine;
-    BOOL    useCRLFs;
+    PBoolean    useCRLFs;
 
-    BOOL       perfectDecode;
+    PBoolean       perfectDecode;
     PINDEX     quadPosition;
     PBYTEArray decodedData;
     PINDEX     decodeSize;
@@ -535,12 +535,12 @@
       const PString & cypher   ///< Base64 Cypher text string to be decoded.
     );
     /**Decode the data. */
-    BOOL Decode(
+    PBoolean Decode(
       const PString & cypher,  ///< Base64 Cypher text string to be decoded.
       PString & clear          ///< Clear text string decoded.
     );
     /**Decode the data. */
-    BOOL Decode(
+    PBoolean Decode(
       const PString & cypher,  ///< Base64 Cypher text string to be decoded.
       PBYTEArray & clear       ///< Clear text binary data decoded.
     );
@@ -571,7 +571,7 @@
     @return
       decoded string.
     */
-    BOOL Decode(
+    PBoolean Decode(
       const PBYTEArray & coded, ///< Encoded data (cyphertext).
       PBYTEArray & clear       ///< Clear text binary data decoded.
     );
@@ -595,7 +595,7 @@
 
     /** Initialise the encoding/decoding sequence. */
     virtual void Initialise(
-      BOOL encoding   ///< Flag for encoding/decoding sequence about to start.
+      PBoolean encoding   ///< Flag for encoding/decoding sequence about to start.
     ) = 0;
 
     /** Encode an n bit block of memory according to the encryption algorithm. */
@@ -670,7 +670,7 @@
   protected:
     /** Initialise the encoding/decoding sequence. */
     virtual void Initialise(
-      BOOL encoding   ///< Flag for encoding/decoding sequence about to start.
+      PBoolean encoding   ///< Flag for encoding/decoding sequence about to start.
     );
 
     /** Encode an n bit block of memory according to the encryption algorithm. */
@@ -782,14 +782,14 @@
        State of the validation keys.
      */
 
-    BOOL ValidatePending();
+    PBoolean ValidatePending();
     /* Validate a pending secured option list for the product. All secured
        keys with the <CODE>pendingPrefix</CODE> name will be checked against
        the value of the field <CODE>securityKey</CODE>. If they match then
        they are copied to the secured variables.
 
        @return
-       TRUE if secure key values are valid.
+       PTrue if secure key values are valid.
      */
 
     void ResetPending();

Modified: ptlib/trunk/include/ptclib/delaychan.h
===================================================================
--- ptlib/trunk/include/ptclib/delaychan.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/delaychan.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -95,10 +95,10 @@
        than later" strategy).
 
        @return
-       TRUE if we are "too late" of @a time milliseconds (unrelated to
+       PTrue if we are "too late" of @a time milliseconds (unrelated to
        the maximum slip time).
       */
-    BOOL Delay(int time);
+    PBoolean Delay(int time);
 
     /**Invalidate the timer. The timing of this function call is not
        important, the timer will restart at the next call to Delay().
@@ -107,7 +107,7 @@
   //@}
  
   protected:
-    BOOL   firstTime;
+    PBoolean   firstTime;
     PTime  targetTime;
 
     PTimeInterval  jitterLimit;
@@ -182,13 +182,13 @@
        of bytes read.
 
        The GetErrorCode() function should be consulted after Read() returns
-       FALSE to determine what caused the failure.
+       PFalse to determine what caused the failure.
 
        @return
-       TRUE indicates that at least one character was read from the channel.
-       FALSE means no bytes were read due to timeout or some other I/O error.
+       PTrue indicates that at least one character was read from the channel.
+       PFalse means no bytes were read due to timeout or some other I/O error.
      */
-    virtual BOOL Read(
+    virtual PBoolean Read(
       void * buf,   ///< Pointer to a block of memory to receive the read bytes.
       PINDEX len    ///< Maximum number of bytes to read into the buffer.
     );
@@ -198,11 +198,11 @@
        of bytes written.
 
        The GetErrorCode() function should be consulted after Write() returns
-       FALSE to determine what caused the failure.
+       PFalse to determine what caused the failure.
 
-       @return TRUE if at least len bytes were written to the channel.
+       @return PTrue if at least len bytes were written to the channel.
      */
-    virtual BOOL Write(
+    virtual PBoolean Write(
       const void * buf, ///< Pointer to a block of memory to write.
       PINDEX len        ///< Number of bytes to write.
     );

Modified: ptlib/trunk/include/ptclib/enum.h
===================================================================
--- ptlib/trunk/include/ptclib/enum.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/enum.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -72,15 +72,15 @@
     PDNS::NAPTRRecord * HandleDNSRecord(PDNS_RECORD dnsRecord, PDNS_RECORD results);
 
     void UnlockOrder()
-    { orderLocked = FALSE; }
+    { orderLocked = PFalse; }
 
   protected:
     PINDEX     currentPos;
     int        lastOrder;
-    BOOL       orderLocked;
+    PBoolean       orderLocked;
 };
 
-inline BOOL GetRecords(const PString & domain, NAPTRRecordList & recordList)
+inline PBoolean GetRecords(const PString & domain, NAPTRRecordList & recordList)
 { return Lookup<NAPTR_SRV, NAPTRRecordList, NAPTRRecord>(domain, recordList); }
 
 /**
@@ -92,13 +92,13 @@
   * Perform a lookup of the specified DN using the specified service
   * and domain list. Returns the resultant URL
   *
-  * @return TRUE if the DN could be resolved, else FALSE
+  * @return PTrue if the DN could be resolved, else PFalse
   */
-BOOL ENUMLookup(
+PBoolean ENUMLookup(
                 const PString & dn,             ///< DN to lookup
                 const PString & service,        ///< ENUM service to use
                 const PStringArray & domains,   ///< list of ENUM domains to search
-                PString & URL                   ///< resolved URL, if return value is TRUE
+                PString & URL                   ///< resolved URL, if return value is PTrue
 );
 
 /**
@@ -107,11 +107,11 @@
   *
   * This function uses the default domain list, which can be set by the SetENUMServers function
   *
-  * @return TRUE if the DN could be resolved, else FALSE
+  * @return PTrue if the DN could be resolved, else PFalse
   */
-BOOL ENUMLookup(const PString & dn,             ///< DN to lookup
+PBoolean ENUMLookup(const PString & dn,             ///< DN to lookup
                 const PString & service,        ///< ENUM service to use
-                PString & URL                   ///< resolved URL, if return value is TRUE
+                PString & URL                   ///< resolved URL, if return value is PTrue
 );   
 
 
@@ -143,12 +143,12 @@
   * specified service. Returns the resultant corresponding 
   * signalling addresses
   *
-  * @return TRUE if the url could be resolved, else FALSE
+  * @return PTrue if the url could be resolved, else PFalse
   */
 
-BOOL RDSLookup(const PURL & url,           ///< URL to lookup
+PBoolean RDSLookup(const PURL & url,           ///< URL to lookup
             const PString & service,       ///< Service to use
-			  PStringList & dn             ///< resolved addresses, if return value is TRUE
+			  PStringList & dn             ///< resolved addresses, if return value is PTrue
 );
 
 /**
@@ -156,13 +156,13 @@
   * on the specified server list that uses the specified service
   * Returns the resultant corresponding signalling addresses
   *
-  * @return TRUE if the url could be resolved, else FALSE
+  * @return PTrue if the url could be resolved, else PFalse
   */
 
-BOOL RDSLookup(const PURL & url,            ///< URL to lookup
+PBoolean RDSLookup(const PURL & url,            ///< URL to lookup
             const PString & service,        ///< Service to use
        const PStringArray & naptrSpaces,    ///< RDS Servers to lookup
-              PStringList & returnStr       ///< resolved addresses, if return value is TRUE
+              PStringList & returnStr       ///< resolved addresses, if return value is PTrue
 );
 
 }; // namespace PDNS

Modified: ptlib/trunk/include/ptclib/ftp.h
===================================================================
--- ptlib/trunk/include/ptclib/ftp.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/ftp.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -77,7 +77,7 @@
     /** Send the PORT command for a transfer.
      @return Boolean indicated PORT command was successful
     */
-    BOOL SendPORT(
+    PBoolean SendPORT(
       const PIPSocket::Address & addr, ///< Address for PORT connection. IP address to connect back to
       WORD port                        ///< Port number for PORT connection.
     );
@@ -108,9 +108,9 @@
     /** Close the socket, and if connected as a client, QUITs from server.
 
        @return
-       TRUE if the channel was closed and the QUIT accepted by the server.
+       PTrue if the channel was closed and the QUIT accepted by the server.
      */
-    virtual BOOL Close();
+    virtual PBoolean Close();
 
   //@}
 
@@ -119,9 +119,9 @@
     /** Log in to the remote host for FTP.
 
        @return
-       TRUE if the log in was successfull.
+       PTrue if the log in was successfull.
      */
-    BOOL LogIn(
+    PBoolean LogIn(
       const PString & username,   ///< User name for FTP log in.
       const PString & password    ///< Password for the specified user name.
     );
@@ -136,18 +136,18 @@
     /** Set the transfer type.
 
        @return
-       TRUE if transfer type set.
+       PTrue if transfer type set.
      */
-    BOOL SetType(
+    PBoolean SetType(
       RepresentationType type   ///< RepresentationTypeof file to transfer
     );
 
     /** Change the current directory on the remote FTP host.
 
        @return
-       TRUE if the log in was successfull.
+       PTrue if the log in was successfull.
      */
-    BOOL ChangeDirectory(
+    PBoolean ChangeDirectory(
       const PString & dirPath     ///< New directory
     );
 
@@ -220,7 +220,7 @@
 
   protected:
     /// Call back to verify open succeeded in an PInternetProtocol class
-    virtual BOOL OnOpen();
+    virtual PBoolean OnOpen();
 
     PTCPSocket * NormalClientTransfer(
       Commands cmd,
@@ -269,28 +269,28 @@
     virtual PString GetSystemTypeString() const;
 
     /// return the thirdPartyPort flag, allowing 3 host put and get.
-    BOOL GetAllowThirdPartyPort() const { return thirdPartyPort; }
+    PBoolean GetAllowThirdPartyPort() const { return thirdPartyPort; }
 
     /// Set the thirdPartyPort flag.
-    void SetAllowThirdPartyPort(BOOL state) { thirdPartyPort = state; }
+    void SetAllowThirdPartyPort(PBoolean state) { thirdPartyPort = state; }
 
     /** Process commands, dispatching to the appropriate virtual function. This
        is used when the socket is acting as a server.
 
        @return
-       TRUE if more processing may be done, FALSE if the QUIT command was
-       received or the #OnUnknown()# function returns FALSE.
+       PTrue if more processing may be done, PFalse if the QUIT command was
+       received or the #OnUnknown()# function returns PFalse.
      */
-    BOOL ProcessCommand();
+    PBoolean ProcessCommand();
 
     /** Dispatching to the appropriate virtual function. This is used when the
        socket is acting as a server.
 
        @return
-       TRUE if more processing may be done, FALSE if the QUIT command was
-       received or the #OnUnknown()# function returns FALSE.
+       PTrue if more processing may be done, PFalse if the QUIT command was
+       received or the #OnUnknown()# function returns PFalse.
      */
-    virtual BOOL DispatchCommand(
+    virtual PBoolean DispatchCommand(
       PINDEX code,          ///< Parsed command code.
       const PString & args  ///< Arguments to command.
     );
@@ -300,41 +300,41 @@
        it may be processed.
 
        @return
-       TRUE if the command required the user to be logged in.
+       PTrue if the command required the user to be logged in.
      */
-    virtual BOOL CheckLoginRequired(
+    virtual PBoolean CheckLoginRequired(
       PINDEX cmd    ///< Command to check if log in required.
     );
 
     /** Validate the user name and password for access. After three invalid
-       attempts, the socket will close and FALSE is returned.
+       attempts, the socket will close and PFalse is returned.
 
-       Default implementation returns TRUE for all strings.
+       Default implementation returns PTrue for all strings.
 
        @return
-       TRUE if user can access, otherwise FALSE
+       PTrue if user can access, otherwise PFalse
      */
-    virtual BOOL AuthoriseUser(
+    virtual PBoolean AuthoriseUser(
       const PString & user,     ///< User name to authorise.
       const PString & password, ///< Password supplied for the user.
-      BOOL & replied            ///< Indication that a reply was sent to client.
+      PBoolean & replied            ///< Indication that a reply was sent to client.
     );
 
     /** Handle an unknown command.
 
        @return
-       TRUE if more processing may be done, FALSE if the
-       #ProcessCommand()# function is to return FALSE.
+       PTrue if more processing may be done, PFalse if the
+       #ProcessCommand()# function is to return PFalse.
      */
-    virtual BOOL OnUnknown(
+    virtual PBoolean OnUnknown(
       const PCaselessString & command  ///< Complete command line received.
     );
 
     /** Handle an error in command.
 
        @return
-       TRUE if more processing may be done, FALSE if the
-       #ProcessCommand()# function is to return FALSE.
+       PTrue if more processing may be done, PFalse if the
+       #ProcessCommand()# function is to return PFalse.
      */
     virtual void OnError(
       PINDEX errorCode, ///< Error code to use
@@ -360,48 +360,48 @@
 
     // the following commands must be implemented by all servers
     // and can be performed without logging in
-    virtual BOOL OnUSER(const PCaselessString & args);
-    virtual BOOL OnPASS(const PCaselessString & args);  // officially optional, but should be done
-    virtual BOOL OnQUIT(const PCaselessString & args);
-    virtual BOOL OnPORT(const PCaselessString & args);
-    virtual BOOL OnSTRU(const PCaselessString & args);
-    virtual BOOL OnMODE(const PCaselessString & args);
-    virtual BOOL OnTYPE(const PCaselessString & args);
-    virtual BOOL OnNOOP(const PCaselessString & args);
-    virtual BOOL OnSYST(const PCaselessString & args);
-    virtual BOOL OnSTAT(const PCaselessString & args);
+    virtual PBoolean OnUSER(const PCaselessString & args);
+    virtual PBoolean OnPASS(const PCaselessString & args);  // officially optional, but should be done
+    virtual PBoolean OnQUIT(const PCaselessString & args);
+    virtual PBoolean OnPORT(const PCaselessString & args);
+    virtual PBoolean OnSTRU(const PCaselessString & args);
+    virtual PBoolean OnMODE(const PCaselessString & args);
+    virtual PBoolean OnTYPE(const PCaselessString & args);
+    virtual PBoolean OnNOOP(const PCaselessString & args);
+    virtual PBoolean OnSYST(const PCaselessString & args);
+    virtual PBoolean OnSTAT(const PCaselessString & args);
 
     // the following commands must be implemented by all servers
     // and cannot be performed without logging in
-    virtual BOOL OnRETR(const PCaselessString & args);
-    virtual BOOL OnSTOR(const PCaselessString & args);
-    virtual BOOL OnACCT(const PCaselessString & args);
-    virtual BOOL OnAPPE(const PCaselessString & args);
-    virtual BOOL OnRNFR(const PCaselessString & args);
-    virtual BOOL OnRNTO(const PCaselessString & args);
-    virtual BOOL OnDELE(const PCaselessString & args);
-    virtual BOOL OnCWD(const PCaselessString & args);
-    virtual BOOL OnCDUP(const PCaselessString & args);
-    virtual BOOL OnRMD(const PCaselessString & args);
-    virtual BOOL OnMKD(const PCaselessString & args);
-    virtual BOOL OnPWD(const PCaselessString & args);
-    virtual BOOL OnLIST(const PCaselessString & args);
-    virtual BOOL OnNLST(const PCaselessString & args);
-    virtual BOOL OnPASV(const PCaselessString & args);
+    virtual PBoolean OnRETR(const PCaselessString & args);
+    virtual PBoolean OnSTOR(const PCaselessString & args);
+    virtual PBoolean OnACCT(const PCaselessString & args);
+    virtual PBoolean OnAPPE(const PCaselessString & args);
+    virtual PBoolean OnRNFR(const PCaselessString & args);
+    virtual PBoolean OnRNTO(const PCaselessString & args);
+    virtual PBoolean OnDELE(const PCaselessString & args);
+    virtual PBoolean OnCWD(const PCaselessString & args);
+    virtual PBoolean OnCDUP(const PCaselessString & args);
+    virtual PBoolean OnRMD(const PCaselessString & args);
+    virtual PBoolean OnMKD(const PCaselessString & args);
+    virtual PBoolean OnPWD(const PCaselessString & args);
+    virtual PBoolean OnLIST(const PCaselessString & args);
+    virtual PBoolean OnNLST(const PCaselessString & args);
+    virtual PBoolean OnPASV(const PCaselessString & args);
 
     // the following commands are optional and can be performed without
     // logging in
-    virtual BOOL OnHELP(const PCaselessString & args);
-    virtual BOOL OnSITE(const PCaselessString & args);
-    virtual BOOL OnABOR(const PCaselessString & args);
+    virtual PBoolean OnHELP(const PCaselessString & args);
+    virtual PBoolean OnSITE(const PCaselessString & args);
+    virtual PBoolean OnABOR(const PCaselessString & args);
 
     // the following commands are optional and cannot be performed
     // without logging in
-    virtual BOOL OnSMNT(const PCaselessString & args);
-    virtual BOOL OnREIN(const PCaselessString & args);
-    virtual BOOL OnSTOU(const PCaselessString & args);
-    virtual BOOL OnALLO(const PCaselessString & args);
-    virtual BOOL OnREST(const PCaselessString & args);
+    virtual PBoolean OnSMNT(const PCaselessString & args);
+    virtual PBoolean OnREIN(const PCaselessString & args);
+    virtual PBoolean OnSTOU(const PCaselessString & args);
+    virtual PBoolean OnALLO(const PCaselessString & args);
+    virtual PBoolean OnREST(const PCaselessString & args);
 
 
     /// Send the specified file to the client.
@@ -412,11 +412,11 @@
 
   protected:
     /// Call back to verify open succeeded in an PInternetProtocol class
-    BOOL OnOpen();
+    PBoolean OnOpen();
     void Construct();
 
     PString readyString;
-    BOOL    thirdPartyPort;
+    PBoolean    thirdPartyPort;
 
     enum {
       NotConnected,

Modified: ptlib/trunk/include/ptclib/guid.h
===================================================================
--- ptlib/trunk/include/ptclib/guid.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/guid.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -117,9 +117,9 @@
 
     /**Test if the GUID is null, ie consists of all zeros.
       */
-    BOOL IsNULL() const;
+    PBoolean IsNULL() const;
 
-    BOOL operator!() const { return !IsNULL(); }
+    PBoolean operator!() const { return !IsNULL(); }
   //@}
 };
 

Modified: ptlib/trunk/include/ptclib/html.h
===================================================================
--- ptlib/trunk/include/ptclib/html.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/html.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -133,7 +133,7 @@
 
 
   // New functions for class.
-    BOOL Is(ElementInSet elmt) const;
+    PBoolean Is(ElementInSet elmt) const;
     void Set(ElementInSet elmt);
     void Clr(ElementInSet elmt);
     void Toggle(ElementInSet elmt);
@@ -582,7 +582,7 @@
         virtual void Output(PHTML & html) const;
         virtual void AddAttr(PHTML & html) const;
       private:
-        BOOL borderFlag;
+        PBoolean borderFlag;
     };
     friend class TableStart;
 
@@ -648,7 +648,7 @@
         virtual ~FieldElement() {}
         virtual void AddAttr(PHTML & html) const;
       private:
-        BOOL disabledFlag;
+        PBoolean disabledFlag;
     };
 
     class Select : public FieldElement {
@@ -695,7 +695,7 @@
       protected:
         virtual void AddAttr(PHTML & html) const;
       private:
-        BOOL selectedFlag;
+        PBoolean selectedFlag;
     };
 
     class FormField : public FieldElement {
@@ -877,7 +877,7 @@
         virtual void AddAttr(PHTML & html) const;
       private:
         const char * valueString;
-        BOOL checkedFlag;
+        PBoolean checkedFlag;
     };
 
     class CheckBox : public RadioButton {

Modified: ptlib/trunk/include/ptclib/http.h
===================================================================
--- ptlib/trunk/include/ptclib/http.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/http.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -78,9 +78,9 @@
        path to another resource but not if it is a leaf node.
 
        @return
-       TRUE if resource added, FALSE if failed.
+       PTrue if resource added, PFalse if failed.
      */
-    BOOL AddResource(
+    PBoolean AddResource(
       PHTTPResource * resource, ///< Resource to add to the name space.
       AddOptions overwrite = ErrorOnExist
         ///< Flag to overwrite an existing resource if it already exists.
@@ -91,9 +91,9 @@
        path to another resource then the function will fail.
 
        @return
-       TRUE if resource deleted, FALSE if failed.
+       PTrue if resource deleted, PFalse if failed.
      */
-    BOOL DelResource(
+    PBoolean DelResource(
       const PURL & url          ///< URL to search for in the name space.
     );
 
@@ -145,7 +145,7 @@
     } * root;
 
   private:
-    BOOL SetSize(PINDEX) { return FALSE; }
+    PBoolean SetSize(PINDEX) { return PFalse; }
 };
 
 #ifdef _WIN32_WCE
@@ -202,7 +202,7 @@
       Conflict,                    ///< 409 - resource conflict on action
       Gone,                        ///< 410 - resource gone away
       LengthRequired,              ///< 411 - no Content-Length
-      UnlessTrue,                  ///< 412 - no Range header for TRUE Unless
+      UnlessTrue,                  ///< 412 - no Range header for PTrue Unless
       InternalServerError = 500,   ///< 500 - server has encountered an unexpected error
       NotImplemented,              ///< 501 - server does not implement request
       BadGateway,                  ///< 502 - error whilst acting as gateway
@@ -250,7 +250,7 @@
        <CODE>lastResponseCode</CODE> and <CODE>lastResponseInfo</CODE>.
 
        The default bahaviour looks for a space or a '-' and splits the code
-       and info either side of that character, then returns FALSE.
+       and info either side of that character, then returns PFalse.
 
        @return
        Position of continuation character in response, 0 if no continuation
@@ -303,7 +303,7 @@
        200!
 
        @return
-       TRUE if all of header returned and ready to receive body.
+       PTrue if all of header returned and ready to receive body.
      */
     int ExecuteCommand(
       Commands cmd,
@@ -311,7 +311,7 @@
       PMIMEInfo & outMIME,
       const PString & dataBody,
       PMIMEInfo & replyMime,
-      BOOL persist = TRUE
+      PBoolean persist = PTrue
     );
     int ExecuteCommand(
       const PString & cmdName,
@@ -319,17 +319,17 @@
       PMIMEInfo & outMIME,
       const PString & dataBody,
       PMIMEInfo & replyMime,
-      BOOL persist = TRUE
+      PBoolean persist = PTrue
     );
 
     /// Write a HTTP command to server
-    BOOL WriteCommand(
+    PBoolean WriteCommand(
       Commands cmd,
       const PString & url,
       PMIMEInfo & outMIME,
       const PString & dataBody
     );
-    BOOL WriteCommand(
+    PBoolean WriteCommand(
       const PString & cmdName,
       const PString & url,
       PMIMEInfo & outMIME,
@@ -337,16 +337,16 @@
     );
 
     /// Read a response from the server
-    BOOL ReadResponse(
+    PBoolean ReadResponse(
       PMIMEInfo & replyMIME
     );
 
     /// Read the body of the HTTP command
-    BOOL ReadContentBody(
+    PBoolean ReadContentBody(
       PMIMEInfo & replyMIME,
       PBYTEArray & body
     );
-    BOOL ReadContentBody(
+    PBoolean ReadContentBody(
       PMIMEInfo & replyMIME,
       PString & body
     );
@@ -355,69 +355,69 @@
     /** Get the document specified by the URL.
 
        @return
-       TRUE if document is being transferred.
+       PTrue if document is being transferred.
      */
-    BOOL GetTextDocument(
+    PBoolean GetTextDocument(
       const PURL & url,         ///< Universal Resource Locator for document.
       PString & document,       ///< Body read
-      BOOL persist = TRUE       ///< if TRUE, enable HTTP persistence
+      PBoolean persist = PTrue       ///< if PTrue, enable HTTP persistence
     );
 
     /** Get the document specified by the URL.
 
        @return
-       TRUE if document is being transferred.
+       PTrue if document is being transferred.
      */
-    BOOL GetDocument(
+    PBoolean GetDocument(
       const PURL & url,         ///< Universal Resource Locator for document.
       PMIMEInfo & outMIME,      ///< MIME info in request
       PMIMEInfo & replyMIME,    ///< MIME info in response
-      BOOL persist = TRUE       ///< if TRUE, enable HTTP persistence
+      PBoolean persist = PTrue       ///< if PTrue, enable HTTP persistence
     );
 
     /** Get the header for the document specified by the URL.
 
        @return
-       TRUE if document header is being transferred.
+       PTrue if document header is being transferred.
      */
-    BOOL GetHeader(
+    PBoolean GetHeader(
       const PURL & url,         ///< Universal Resource Locator for document.
       PMIMEInfo & outMIME,      ///< MIME info in request
       PMIMEInfo & replyMIME,    ///< MIME info in response
-      BOOL persist = TRUE       ///< if TRUE, enable HTTP persistence
+      PBoolean persist = PTrue       ///< if PTrue, enable HTTP persistence
     );
 
 
     /** Post the data specified to the URL.
 
        @return
-       TRUE if document is being transferred.
+       PTrue if document is being transferred.
      */
-    BOOL PostData(
+    PBoolean PostData(
       const PURL & url,       ///< Universal Resource Locator for document.
       PMIMEInfo & outMIME,    ///< MIME info in request
       const PString & data,   ///< Information posted to the HTTP server.
       PMIMEInfo & replyMIME,  ///< MIME info in response
-      BOOL persist = TRUE     ///< if TRUE, enable HTTP persistence
+      PBoolean persist = PTrue     ///< if PTrue, enable HTTP persistence
     );
 
     /** Post the data specified to the URL.
 
        @return
-       TRUE if document is being transferred.
+       PTrue if document is being transferred.
      */
-    BOOL PostData(
+    PBoolean PostData(
       const PURL & url,       ///< Universal Resource Locator for document.
       PMIMEInfo & outMIME,    ///< MIME info in request
       const PString & data,   ///< Information posted to the HTTP server.
       PMIMEInfo & replyMIME,  ///< MIME info in response
       PString & replyBody,    ///< Body of response
-      BOOL persist = TRUE     ///< if TRUE, enable HTTP persistence
+      PBoolean persist = PTrue     ///< if PTrue, enable HTTP persistence
     );
 
   protected:
-    BOOL AssureConnect(const PURL & url, PMIMEInfo & outMIME);
-    BOOL InternalReadContentBody(
+    PBoolean AssureConnect(const PURL & url, PMIMEInfo & outMIME);
+    PBoolean InternalReadContentBody(
       PMIMEInfo & replyMIME,
       PAbstractArray & body
     );
@@ -465,11 +465,11 @@
     const PMIMEInfo & GetMIME() const { return mimeInfo; }
     void SetMIME(const PString & tag, const PString & value);
 
-    BOOL IsCompatible(int major, int minor) const;
+    PBoolean IsCompatible(int major, int minor) const;
 
-    BOOL IsPersistant() const         { return isPersistant; }
-    BOOL WasPersistant() const        { return wasPersistant; }
-    BOOL IsProxyConnection() const    { return isProxyConnection; }
+    PBoolean IsPersistant() const         { return isPersistant; }
+    PBoolean WasPersistant() const        { return wasPersistant; }
+    PBoolean IsProxyConnection() const    { return isProxyConnection; }
     int  GetMajorVersion() const      { return majorVersion; }
     int  GetMinorVersion() const      { return minorVersion; }
 
@@ -502,16 +502,16 @@
     PString GetEntityBody() const   { return entityBody; }
 
   protected:
-    BOOL Initialise(PHTTPServer & server, PString & args);
+    PBoolean Initialise(PHTTPServer & server, PString & args);
     void DecodeMultipartFormInfo(const PString & type, const PString & entityBody);
 
     PHTTP::Commands commandCode;
     PString         commandName;
     PURL            url;
     PMIMEInfo       mimeInfo;
-    BOOL            isPersistant;
-    BOOL            wasPersistant;
-    BOOL            isProxyConnection;
+    PBoolean            isPersistant;
+    PBoolean            wasPersistant;
+    PBoolean            isProxyConnection;
     int             majorVersion;
     int             minorVersion;
     PString         entityBody;        // original entity body (POST only)
@@ -536,7 +536,7 @@
     basic POP3 server functionality.
 
     The server socket thread would continuously call the
-    #ProcessMessage()# function until it returns FALSE. This will then
+    #ProcessMessage()# function until it returns PFalse. This will then
     call the appropriate virtual function on parsing the POP3 protocol.
  */
 class PHTTPServer : public PHTTP
@@ -582,12 +582,12 @@
        is used when the socket is acting as a server.
 
        @return
-       TRUE if the request specified persistant mode and the request version
-       allows it, FALSE if the socket closed, timed out, the protocol does not
+       PTrue if the request specified persistant mode and the request version
+       allows it, PFalse if the socket closed, timed out, the protocol does not
        allow persistant mode, or the client did not request it
        timed out
      */
-    virtual BOOL ProcessCommand();
+    virtual PBoolean ProcessCommand();
 
     /** Handle a GET command from a client.
 
@@ -596,11 +596,11 @@
        #PHTTPResource# object contained therein.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close
+       PTrue if the connection may persist, PFalse if the connection must close
        If there is no ContentLength field in the response, this value must
-       be FALSE for correct operation.
+       be PFalse for correct operation.
      */
-    virtual BOOL OnGET(
+    virtual PBoolean OnGET(
       const PURL & url,                    ///< Universal Resource Locator for document.
       const PMIMEInfo & info,              ///< Extra MIME information in command.
       const PHTTPConnectionInfo & conInfo  ///< HTTP connection information
@@ -615,11 +615,11 @@
        #PHTTPResource# object contained therein.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close
+       PTrue if the connection may persist, PFalse if the connection must close
        If there is no ContentLength field in the response, this value must
-       be FALSE for correct operation.
+       be PFalse for correct operation.
      */
-    virtual BOOL OnHEAD(
+    virtual PBoolean OnHEAD(
       const PURL & url,                   ///< Universal Resource Locator for document.
       const PMIMEInfo & info,             ///< Extra MIME information in command.
       const PHTTPConnectionInfo & conInfo ///< HTTP connection information
@@ -632,11 +632,11 @@
        #PHTTPResource# object contained therein.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close
+       PTrue if the connection may persist, PFalse if the connection must close
        If there is no ContentLength field in the response, this value must
-       be FALSE for correct operation.
+       be PFalse for correct operation.
      */
-    virtual BOOL OnPOST(
+    virtual PBoolean OnPOST(
       const PURL & url,                   ///< Universal Resource Locator for document.
       const PMIMEInfo & info,             ///< Extra MIME information in command.
       const PStringToString & data,       ///< Variables provided in the POST data.
@@ -651,11 +651,11 @@
        The default implementation returns OnError(BadGateway).
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close
+       PTrue if the connection may persist, PFalse if the connection must close
        If there is no ContentLength field in the response, this value must
-       be FALSE for correct operation.
+       be PFalse for correct operation.
      */
-    virtual BOOL OnProxy(
+    virtual PBoolean OnProxy(
       const PHTTPConnectionInfo & conInfo   ///<  HTTP connection information
     );
 
@@ -671,9 +671,9 @@
     /** Handle an unknown command.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close
+       PTrue if the connection may persist, PFalse if the connection must close
      */
-    virtual BOOL OnUnknown(
+    virtual PBoolean OnUnknown(
       const PCaselessString & command,         ///< Complete command line received.
       const PHTTPConnectionInfo & connectInfo  ///< HTTP connection information
     );
@@ -694,9 +694,9 @@
        nothing.
 
        @return
-       TRUE if requires v1.1 chunked transfer encoding.
+       PTrue if requires v1.1 chunked transfer encoding.
      */
-    BOOL StartResponse(
+    PBoolean StartResponse(
       StatusCode code,      ///< Status code for the response.
       PMIMEInfo & headers,  ///< MIME variables included in response.
       long bodySize         ///< Size of the rest of the response.
@@ -709,9 +709,9 @@
        viewer.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close
+       PTrue if the connection may persist, PFalse if the connection must close
      */
-    virtual BOOL OnError(
+    virtual PBoolean OnError(
       StatusCode code,                         ///< Status code for the error response.
       const PCaselessString & extra,           ///< Extra information included in the response.
       const PHTTPConnectionInfo & connectInfo  ///< HTTP connection information
@@ -797,9 +797,9 @@
        the realm specified by the class instance.
 
        @return
-       TRUE if the user and password are authorised in the realm.
+       PTrue if the user and password are authorised in the realm.
      */
-    virtual BOOL Validate(
+    virtual PBoolean Validate(
       const PHTTPRequest & request,  ///< Request information.
       const PString & authInfo       ///< Authority information string.
     ) const = 0;
@@ -808,12 +808,12 @@
        distinguish between net requiring authorisation and requiring autorisation
        but having no password.
 
-       The default behaviour is to return TRUE.
+       The default behaviour is to return PTrue.
 
        @return
-       TRUE if the authorisation in the realm is to be applied.
+       PTrue if the authorisation in the realm is to be applied.
      */
-    virtual BOOL IsActive() const;
+    virtual PBoolean IsActive() const;
 
   protected:
     static void DecodeBasicAuthority(
@@ -869,9 +869,9 @@
        the realm specified by the class instance.
 
        @return
-       TRUE if the user and password are authorised in the realm.
+       PTrue if the user and password are authorised in the realm.
      */
-    virtual BOOL Validate(
+    virtual PBoolean Validate(
       const PHTTPRequest & request,  ///< Request information.
       const PString & authInfo       ///< Authority information string.
     ) const;
@@ -880,12 +880,12 @@
        distinguish between net requiring authorisation and requiring autorisation
        but having no password.
 
-       The default behaviour is to return TRUE.
+       The default behaviour is to return PTrue.
 
        @return
-       TRUE if the authorisation in the realm is to be applied.
+       PTrue if the authorisation in the realm is to be applied.
      */
-    virtual BOOL IsActive() const;
+    virtual PBoolean IsActive() const;
 
     /** Get the user name allocated to this simple authorisation.
 
@@ -956,9 +956,9 @@
        the realm specified by the class instance.
 
        @return
-       TRUE if the user and password are authorised in the realm.
+       PTrue if the user and password are authorised in the realm.
      */
-    virtual BOOL Validate(
+    virtual PBoolean Validate(
       const PHTTPRequest & request,  ///< Request information.
       const PString & authInfo       ///< Authority information string.
     ) const;
@@ -967,12 +967,12 @@
        distinguish between net requiring authorisation and requiring autorisation
        but having no password.
 
-       The default behaviour is to return TRUE.
+       The default behaviour is to return PTrue.
 
        @return
-       TRUE if the authorisation in the realm is to be applied.
+       PTrue if the authorisation in the realm is to be applied.
      */
-    virtual BOOL IsActive() const;
+    virtual PBoolean IsActive() const;
 
     /** Get the user name allocated to this simple authorisation.
 
@@ -1078,11 +1078,11 @@
        a resource to be sent to the socket.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close.
+       PTrue if the connection may persist, PFalse if the connection must close.
        If there is no ContentLength field in the response, this value must
-       be FALSE for correct operation.
+       be PFalse for correct operation.
      */
-    virtual BOOL OnGET(
+    virtual PBoolean OnGET(
       PHTTPServer & server,       ///< HTTP server that received the request
       const PURL & url,           ///< Universal Resource Locator for document.
       const PMIMEInfo & info,     ///< Extra MIME information in command.
@@ -1094,11 +1094,11 @@
        The default action calls #SendData()#.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close.
+       PTrue if the connection may persist, PFalse if the connection must close.
        If there is no ContentLength field in the response, this value must
-       be FALSE for correct operation.
+       be PFalse for correct operation.
     */
-    virtual BOOL OnGETData(
+    virtual PBoolean OnGETData(
       PHTTPServer & server,                       ///< HTTP server that received the request
       const PURL & url,                           ///< Universal Resource Locator for document
       const PHTTPConnectionInfo & connectInfo,    ///< HTTP connection information
@@ -1112,11 +1112,11 @@
        be sent to the socket.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close
+       PTrue if the connection may persist, PFalse if the connection must close
        If there is no ContentLength field in the response, this value must
-       be FALSE for correct operation.
+       be PFalse for correct operation.
      */
-    virtual BOOL OnHEAD(
+    virtual PBoolean OnHEAD(
       PHTTPServer & server,       ///< HTTP server that received the request
       const PURL & url,           ///< Universal Resource Locator for document.
       const PMIMEInfo & info,     ///< Extra MIME information in command.
@@ -1130,11 +1130,11 @@
        received.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close
+       PTrue if the connection may persist, PFalse if the connection must close
        If there is no ContentLength field in the response, this value must
-       be FALSE for correct operation.
+       be PFalse for correct operation.
      */
-    virtual BOOL OnPOST(
+    virtual PBoolean OnPOST(
       PHTTPServer & server,         ///< HTTP server that received the request
       const PURL & url,             ///< Universal Resource Locator for document.
       const PMIMEInfo & info,       ///< Extra MIME information in command.
@@ -1147,11 +1147,11 @@
        The default action calls #Post()#.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close.
+       PTrue if the connection may persist, PFalse if the connection must close.
        If there is no ContentLength field in the response, this value must
-       be FALSE for correct operation.
+       be PFalse for correct operation.
     */
-    virtual BOOL OnPOSTData(
+    virtual PBoolean OnPOSTData(
       PHTTPRequest & request,        ///< request information
       const PStringToString & data   ///< Variables in the POST data.
     );
@@ -1160,9 +1160,9 @@
        specified.
 
        @return
-       TRUE if has been modified since.
+       PTrue if has been modified since.
      */
-    virtual BOOL IsModifiedSince(
+    virtual PBoolean IsModifiedSince(
       const PTime & when    ///< Time to see if modified later than
     );
 
@@ -1171,7 +1171,7 @@
        @return
        Status of load operation.
      */
-    virtual BOOL GetExpirationDate(
+    virtual PBoolean GetExpirationDate(
       PTime & when          ///< Time that the resource expires
     );
 
@@ -1194,9 +1194,9 @@
        required by the resource and return the status for the load.
 
        @return
-       TRUE if all OK, FALSE if an error occurred.
+       PTrue if all OK, PFalse if an error occurred.
      */
-    virtual BOOL LoadHeaders(
+    virtual PBoolean LoadHeaders(
       PHTTPRequest & request    ///<  Information on this request.
     ) = 0;
 
@@ -1215,9 +1215,9 @@
        if successful, call the #OnLoadedText()# function.
 
        @return
-       TRUE if there is still more to load.
+       PTrue if there is still more to load.
      */
-    virtual BOOL LoadData(
+    virtual PBoolean LoadData(
       PHTTPRequest & request,    ///<  Information on this request.
       PCharArray & data          ///<  Data used in reply.
     );
@@ -1251,9 +1251,9 @@
        success.
 
        @return
-       TRUE if the connection may persist, FALSE if the connection must close
+       PTrue if the connection may persist, PFalse if the connection must close
      */
-    virtual BOOL Post(
+    virtual PBoolean Post(
       PHTTPRequest & request,       ///<  Information on this request.
       const PStringToString & data, ///<  Variables in the POST data.
       PHTML & replyMessage          ///<  Reply message for post.
@@ -1263,12 +1263,12 @@
   protected:
     /** See if the resource is authorised given the mime info
      */
-    virtual BOOL CheckAuthority(
+    virtual PBoolean CheckAuthority(
       PHTTPServer & server,               ///<  Server to send response to.
       const PHTTPRequest & request,       ///<  Information on this request.
       const PHTTPConnectionInfo & conInfo ///<  Information on the connection
     );
-    static BOOL CheckAuthority(
+    static PBoolean CheckAuthority(
                    PHTTPAuthority & authority,
                       PHTTPServer & server,
                const PHTTPRequest & request,
@@ -1277,12 +1277,12 @@
 
 
     /** common code for GET and HEAD commands */
-    virtual BOOL OnGETOrHEAD(
+    virtual PBoolean OnGETOrHEAD(
       PHTTPServer & server,       ///<  HTTP server that received the request
       const PURL & url,           ///<  Universal Resource Locator for document.
       const PMIMEInfo & info,     ///<  Extra MIME information in command.
       const PHTTPConnectionInfo & conInfo,
-      BOOL  IsGet
+      PBoolean  IsGet
     );
 
     /// Base URL for the resource, may accept URLS with a longer hierarchy
@@ -1346,9 +1346,9 @@
        required by the resource and return the status for the load.
 
        @return
-       TRUE if all OK, FALSE if an error occurred.
+       PTrue if all OK, PFalse if an error occurred.
      */
-    virtual BOOL LoadHeaders(
+    virtual PBoolean LoadHeaders(
       PHTTPRequest & request    // Information on this request.
     );
 
@@ -1450,18 +1450,18 @@
        required by the resource and return the status for the load.
 
        @return
-       TRUE if all OK, FALSE if an error occurred.
+       PTrue if all OK, PFalse if an error occurred.
      */
-    virtual BOOL LoadHeaders(
+    virtual PBoolean LoadHeaders(
       PHTTPRequest & request    // Information on this request.
     );
 
     /** Get a block of data that the resource contains.
 
        @return
-       TRUE if more to load.
+       PTrue if more to load.
      */
-    virtual BOOL LoadData(
+    virtual PBoolean LoadData(
       PHTTPRequest & request,    // Information on this request.
       PCharArray & data          // Data used in reply.
     );
@@ -1563,18 +1563,18 @@
        required by the resource and return the status for the load.
 
        @return
-       TRUE if all OK, FALSE if an error occurred.
+       PTrue if all OK, PFalse if an error occurred.
      */
-    virtual BOOL LoadHeaders(
+    virtual PBoolean LoadHeaders(
       PHTTPRequest & request    // Information on this request.
     );
 
     /** Get a block of data that the resource contains.
 
        @return
-       TRUE if more to load.
+       PTrue if more to load.
      */
-    virtual BOOL LoadData(
+    virtual PBoolean LoadData(
       PHTTPRequest & request,    // Information on this request.
       PCharArray & data          // Data used in reply.
     );
@@ -1631,9 +1631,9 @@
        required by the resource and return the status for the load.
 
        @return
-       TRUE if all OK, FALSE if an error occurred.
+       PTrue if all OK, PFalse if an error occurred.
      */
-    virtual BOOL LoadHeaders(
+    virtual PBoolean LoadHeaders(
       PHTTPRequest & request    /// Information on this request.
     );
 
@@ -1661,20 +1661,20 @@
 
     /** Enable or disable directory listings when a default directory file does not exist
      */
-    void AllowDirectories(BOOL enable = TRUE);
+    void AllowDirectories(PBoolean enable = PTrue);
 
   protected:
-    BOOL CheckAuthority(
+    PBoolean CheckAuthority(
       PHTTPServer & server,               // Server to send response to.
       const PHTTPRequest & request,       // Information on this request.
       const PHTTPConnectionInfo & conInfo // Information on the connection
     );
 
-    BOOL FindAuthorisations(const PDirectory & dir, PString & realm, PStringToString & authorisations);
+    PBoolean FindAuthorisations(const PDirectory & dir, PString & realm, PStringToString & authorisations);
 
     PDirectory basePath;
     PString authorisationRealm;
-    BOOL allowDirectoryListing;
+    PBoolean allowDirectoryListing;
 };
 
 

Modified: ptlib/trunk/include/ptclib/httpform.h
===================================================================
--- ptlib/trunk/include/ptclib/httpform.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/httpform.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -161,7 +161,7 @@
        @return
        String for field value.
      */
-    virtual PString GetValue(BOOL dflt = FALSE) const = 0;
+    virtual PString GetValue(PBoolean dflt = PFalse) const = 0;
 
     /** Set the value of the field.
      */
@@ -186,9 +186,9 @@
     /** Validate the new field value before #SetValue()# is called.
 
        @return
-       BOOL if the new field value is OK.
+       PBoolean if the new field value is OK.
      */
-    virtual BOOL Validated(
+    virtual PBoolean Validated(
       const PString & newVal, // Proposed new value for the field.
       PStringStream & msg     // Stream to take error HTML if value not valid.
     ) const;
@@ -210,23 +210,23 @@
     /** Validate the new field value in a list before #SetValue()# is called.
 
        @return
-       BOOL if the all the new field values are OK.
+       PBoolean if the all the new field values are OK.
      */
-    virtual BOOL ValidateAll(
+    virtual PBoolean ValidateAll(
       const PStringToString & data, // Proposed new value for the field.
       PStringStream & msg     // Stream to take error HTML if value not valid.
     ) const;
 
 
-    BOOL NotYetInHTML() const { return notInHTML; }
-    void SetInHTML() { notInHTML = FALSE; }
+    PBoolean NotYetInHTML() const { return notInHTML; }
+    void SetInHTML() { notInHTML = PFalse; }
 
   protected:
     PCaselessString baseName;
     PCaselessString fullName;
     PString title;
     PString help;
-    BOOL notInHTML;
+    PBoolean notInHTML;
 };
 
 
@@ -266,7 +266,7 @@
       PHTML & html    // HTML to receive the field info.
     ) const;
 
-    virtual PString GetValue(BOOL dflt = FALSE) const;
+    virtual PString GetValue(PBoolean dflt = PFalse) const;
 
     virtual void SetValue(
       const PString & newValue   // New value for the field.
@@ -284,7 +284,7 @@
       const PStringToString & data   // New value for the field.
     );
 
-    virtual BOOL ValidateAll(
+    virtual PBoolean ValidateAll(
       const PStringToString & data, // Proposed new value for the field.
       PStringStream & msg     // Stream to take error HTML if value not valid.
     ) const;
@@ -338,7 +338,7 @@
   public:
     PHTTPFieldArray(
       PHTTPField * baseField,
-      BOOL ordered,
+      PBoolean ordered,
       PINDEX fixedSize = 0
     );
 
@@ -383,8 +383,8 @@
     void SetArrayFieldName(PINDEX idx) const;
 
     PHTTPField * baseField;
-    BOOL orderedArray;
-    BOOL canAddElements;
+    PBoolean orderedArray;
+    PBoolean canAddElements;
 };
 
 
@@ -412,7 +412,7 @@
       PHTML & html    ///< HTML to receive the field info.
     ) const;
 
-    virtual PString GetValue(BOOL dflt = FALSE) const;
+    virtual PString GetValue(PBoolean dflt = PFalse) const;
 
     virtual void SetValue(
       const PString & newVal
@@ -450,7 +450,7 @@
       PHTML & html    ///< HTML to receive the field info.
     ) const;
 
-    virtual PString GetValue(BOOL dflt = FALSE) const;
+    virtual PString GetValue(PBoolean dflt = PFalse) const;
 
     virtual void SetValue(
       const PString & newVal
@@ -486,7 +486,7 @@
       PHTML & html    ///< HTML to receive the field info.
     ) const;
 
-    virtual PString GetValue(BOOL dflt = FALSE) const;
+    virtual PString GetValue(PBoolean dflt = PFalse) const;
 
     virtual void SetValue(
       const PString & newVal
@@ -499,7 +499,7 @@
       PConfig & cfg   ///< Configuration for value transfer.
     ) const;
 
-    virtual BOOL Validated(
+    virtual PBoolean Validated(
       const PString & newVal,
       PStringStream & msg
     ) const;
@@ -518,13 +518,13 @@
   public:
     PHTTPBooleanField(
       const char * name,
-      BOOL initVal = FALSE,
+      PBoolean initVal = PFalse,
       const char * help = NULL
     );
     PHTTPBooleanField(
       const char * name,
       const char * title,
-      BOOL initVal = FALSE,
+      PBoolean initVal = PFalse,
       const char * help = NULL
     );
 
@@ -538,7 +538,7 @@
       const PString & input
     ) const;
 
-    virtual PString GetValue(BOOL dflt = FALSE) const;
+    virtual PString GetValue(PBoolean dflt = PFalse) const;
 
     virtual void SetValue(
       const PString & newVal
@@ -553,7 +553,7 @@
 
 
   protected:
-    BOOL value, initialValue;
+    PBoolean value, initialValue;
 };
 
 
@@ -632,7 +632,7 @@
       const PString & input
     ) const;
 
-    virtual PString GetValue(BOOL dflt = FALSE) const;
+    virtual PString GetValue(PBoolean dflt = PFalse) const;
 
     virtual void SetValue(
       const PString & newVal
@@ -686,7 +686,7 @@
       PHTML & html    ///< HTML to receive the field info.
     ) const;
 
-    virtual PString GetValue(BOOL dflt = FALSE) const;
+    virtual PString GetValue(PBoolean dflt = PFalse) const;
 
     virtual void SetValue(
       const PString & newVal
@@ -731,7 +731,7 @@
       PHTTPRequest & request,    ///< Information on this request.
       PString & text             ///< Data used in reply.
     );
-    virtual BOOL Post(
+    virtual PBoolean Post(
       PHTTPRequest & request,       ///< Information on this request.
       const PStringToString & data, ///< Variables in the POST data.
       PHTML & replyMessage          ///< Reply message for post.
@@ -800,7 +800,7 @@
       PHTTPRequest & request,    ///< Information on this request.
       PString & text             ///< Data used in reply.
     );
-    virtual BOOL Post(
+    virtual PBoolean Post(
       PHTTPRequest & request,       ///< Information on this request.
       const PStringToString & data, ///< Variables in the POST data.
       PHTML & replyMessage          ///< Reply message for post.
@@ -877,7 +877,7 @@
       PHTTPRequest & request,    ///< Information on this request.
       PString & text             ///< Data used in reply.
     );
-    virtual BOOL Post(
+    virtual PBoolean Post(
       PHTTPRequest & request,       ///< Information on this request.
       const PStringToString & data, ///< Variables in the POST data.
       PHTML & replyMessage          ///< Reply message for post.

Modified: ptlib/trunk/include/ptclib/httpsvc.h
===================================================================
--- ptlib/trunk/include/ptclib/httpsvc.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/httpsvc.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -104,21 +104,21 @@
     PHTTPServiceProcess(const Info & inf);
     ~PHTTPServiceProcess();
 
-    BOOL OnStart();
+    PBoolean OnStart();
     void OnStop();
-    BOOL OnPause();
+    PBoolean OnPause();
     void OnContinue();
     const char * GetServiceDependencies() const;
 
     virtual void OnConfigChanged() = 0;
-    virtual BOOL Initialise(const char * initMsg) = 0;
+    virtual PBoolean Initialise(const char * initMsg) = 0;
 
-    BOOL ListenForHTTP(
+    PBoolean ListenForHTTP(
       WORD port,
       PSocket::Reusability reuse = PSocket::CanReuseAddress,
       PINDEX stackSize = 0x4000
     );
-    BOOL ListenForHTTP(
+    PBoolean ListenForHTTP(
       PSocket * listener,
       PSocket::Reusability reuse = PSocket::CanReuseAddress,
       PINDEX stackSize = 0x4000
@@ -138,18 +138,18 @@
     const PTEACypher::Key & GetProductKey() const { return productKey; }
     const PStringArray & GetSecuredKeys() const { return securedKeys; }
     const PTEACypher::Key & GetSignatureKey() const { return signatureKey; }
-    BOOL ShouldIgnoreSignatures() const { return ignoreSignatures; }
-    void SetIgnoreSignatures(BOOL ig) { ignoreSignatures = ig; }
+    PBoolean ShouldIgnoreSignatures() const { return ignoreSignatures; }
+    void SetIgnoreSignatures(PBoolean ig) { ignoreSignatures = ig; }
 
     static PHTTPServiceProcess & Current();
 
     virtual void AddRegisteredText(PHTML & html);
     virtual void AddUnregisteredText(PHTML & html);
-    virtual BOOL SubstituteEquivalSequence(PHTTPRequest & request, const PString &, PString &);
+    virtual PBoolean SubstituteEquivalSequence(PHTTPRequest & request, const PString &, PString &);
     virtual PHTTPServer * CreateHTTPServer(PTCPSocket & socket);
     virtual PHTTPServer * OnCreateHTTPServer(const PHTTPSpace & urlSpace);
     PTCPSocket * AcceptHTTP();
-    BOOL ProcessHTTP(PTCPSocket & socket);
+    PBoolean ProcessHTTP(PTCPSocket & socket);
 
   protected:
     PSocket  * httpListeningSocket;
@@ -159,7 +159,7 @@
     PTEACypher::Key productKey;
     PStringArray    securedKeys;
     PTEACypher::Key signatureKey;
-    BOOL            ignoreSignatures;
+    PBoolean            ignoreSignatures;
 
     PTime      compilationDate;
     PString    manufacturersHomePage;
@@ -206,7 +206,7 @@
 
     void OnLoadedText(PHTTPRequest &, PString & text);
 
-    BOOL OnPOST(
+    PBoolean OnPOST(
       PHTTPServer & server,
       const PURL & url,
       const PMIMEInfo & info,
@@ -214,14 +214,14 @@
       const PHTTPConnectionInfo & connectInfo
     );
 
-    virtual BOOL Post(
+    virtual PBoolean Post(
       PHTTPRequest & request,       ///< Information on this request.
       const PStringToString & data, ///< Variables in the POST data.
       PHTML & replyMessage          ///< Reply message for post.
     );
 
   protected:
-    virtual BOOL GetExpirationDate(
+    virtual PBoolean GetExpirationDate(
       PTime & when          ///< Time that the resource expires
     );
 
@@ -249,7 +249,7 @@
 
     void OnLoadedText(PHTTPRequest &, PString & text);
 
-    BOOL OnPOST(
+    PBoolean OnPOST(
       PHTTPServer & server,
       const PURL & url,
       const PMIMEInfo & info,
@@ -257,14 +257,14 @@
       const PHTTPConnectionInfo & connectInfo
     );
 
-    virtual BOOL Post(
+    virtual PBoolean Post(
       PHTTPRequest & request,       ///< Information on this request.
       const PStringToString & data, ///< Variables in the POST data.
       PHTML & replyMessage          ///< Reply message for post.
     );
 
   protected:
-    virtual BOOL GetExpirationDate(
+    virtual PBoolean GetExpirationDate(
       PTime & when          ///< Time that the resource expires
     );
 
@@ -288,7 +288,7 @@
     );
     void OnLoadedText(PHTTPRequest & request, PString & text);
 
-    virtual BOOL Post(
+    virtual PBoolean Post(
       PHTTPRequest & request,       ///< Information on this request.
       const PStringToString & data, ///< Variables in the POST data.
       PHTML & replyMessage          ///< Reply message for post.
@@ -322,8 +322,8 @@
     static PString CalculateSignature(const PString & out);
     static PString CalculateSignature(const PString & out, const PTEACypher::Key & sig);
 
-    BOOL CheckSignature();
-    static BOOL CheckSignature(const PString & html);
+    PBoolean CheckSignature();
+    static PBoolean CheckSignature(const PString & html);
 
     enum MacroOptions {
       NoOptions           = 0,
@@ -332,7 +332,7 @@
       NoURLOverride       = 4,
       NoSignatureForFile  = 8
     };
-    static BOOL ProcessMacros(PHTTPRequest & request,
+    static PBoolean ProcessMacros(PHTTPRequest & request,
                               PString & text,
                               const PString & filename,
                               unsigned options);
@@ -344,8 +344,8 @@
 class PServiceMacro : public PObject
 {
   public:
-    PServiceMacro(const char * name, BOOL isBlock);
-    PServiceMacro(const PCaselessString & name, BOOL isBlock);
+    PServiceMacro(const char * name, PBoolean isBlock);
+    PServiceMacro(const PCaselessString & name, PBoolean isBlock);
     Comparison Compare(const PObject & obj) const;
     virtual PString Translate(
       PHTTPRequest & request,
@@ -354,7 +354,7 @@
     ) const;
   protected:
     const char * macroName;
-    BOOL isMacroBlock;
+    PBoolean isMacroBlock;
     PServiceMacro * link;
     static PServiceMacro * list;
   friend class PServiceMacros_list;
@@ -366,7 +366,7 @@
 #define PCREATE_SERVICE_MACRO(name, request, args) \
   class PServiceMacro_##name : public PServiceMacro { \
     public: \
-      PServiceMacro_##name() : PServiceMacro(#name, FALSE) { } \
+      PServiceMacro_##name() : PServiceMacro(#name, PFalse) { } \
       PString Translate(PHTTPRequest &, const PString &, const PString &) const; \
   }; \
   static const PServiceMacro_##name serviceMacro_##name; \
@@ -377,7 +377,7 @@
 #define PCREATE_SERVICE_MACRO_BLOCK(name, request, args, block) \
   class PServiceMacro_##name : public PServiceMacro { \
     public: \
-      PServiceMacro_##name() : PServiceMacro(#name, TRUE) { } \
+      PServiceMacro_##name() : PServiceMacro(#name, PTrue) { } \
       PString Translate(PHTTPRequest &, const PString &, const PString &) const; \
   }; \
   static const PServiceMacro_##name serviceMacro_##name; \
@@ -409,7 +409,7 @@
     PString LoadText(PHTTPRequest &);
 
   protected:
-    virtual BOOL GetExpirationDate(
+    virtual PBoolean GetExpirationDate(
       PTime & when          ///< Time that the resource expires
     );
 };
@@ -419,43 +419,45 @@
 {
   PCLASSINFO(PServiceHTTPFile, PHTTPFile)
   public:
-    PServiceHTTPFile(const PString & filename, BOOL needSig = FALSE)
+    PServiceHTTPFile(const PString & filename, PBoolean needSig = PFalse)
       : PHTTPFile(filename) { needSignature = needSig; }
-    PServiceHTTPFile(const PString & filename, const PFilePath & file, BOOL needSig = FALSE)
+    PServiceHTTPFile(const PString & filename, const PFilePath & file, PBoolean needSig = PFalse)
       : PHTTPFile(filename, file) { needSignature = needSig; }
-    PServiceHTTPFile(const PString & filename, const PHTTPAuthority & auth, BOOL needSig = FALSE)
+    PServiceHTTPFile(const PString & filename, const PString & file, PBoolean needSig = PFalse)
+      : PHTTPFile(filename, file) { needSignature = needSig; }
+    PServiceHTTPFile(const PString & filename, const PHTTPAuthority & auth, PBoolean needSig = PFalse)
       : PHTTPFile(filename, auth) { needSignature = needSig; }
-    PServiceHTTPFile(const PString & filename, const PFilePath & file, const PHTTPAuthority & auth, BOOL needSig = FALSE)
+    PServiceHTTPFile(const PString & filename, const PFilePath & file, const PHTTPAuthority & auth, PBoolean needSig = PFalse)
       : PHTTPFile(filename, file, auth) { needSignature = needSig; }
 
     void OnLoadedText(PHTTPRequest &, PString & text);
 
   protected:
-    virtual BOOL GetExpirationDate(
+    virtual PBoolean GetExpirationDate(
       PTime & when          ///< Time that the resource expires
     );
 
-    BOOL needSignature;
+    PBoolean needSignature;
 };
 
 class PServiceHTTPDirectory : public PHTTPDirectory
 {
   PCLASSINFO(PServiceHTTPDirectory, PHTTPDirectory)
   public:
-    PServiceHTTPDirectory(const PURL & url, const PDirectory & dirname, BOOL needSig = FALSE)
+    PServiceHTTPDirectory(const PURL & url, const PDirectory & dirname, PBoolean needSig = PFalse)
       : PHTTPDirectory(url, dirname) { needSignature = needSig; }
 
-    PServiceHTTPDirectory(const PURL & url, const PDirectory & dirname, const PHTTPAuthority & auth, BOOL needSig = FALSE)
+    PServiceHTTPDirectory(const PURL & url, const PDirectory & dirname, const PHTTPAuthority & auth, PBoolean needSig = PFalse)
       : PHTTPDirectory(url, dirname, auth) { needSignature = needSig; }
 
     void OnLoadedText(PHTTPRequest &, PString & text);
 
   protected:
-    virtual BOOL GetExpirationDate(
+    virtual PBoolean GetExpirationDate(
       PTime & when          ///< Time that the resource expires
     );
 
-    BOOL needSignature;
+    PBoolean needSignature;
 };
 
 

Modified: ptlib/trunk/include/ptclib/inetmail.h
===================================================================
--- ptlib/trunk/include/ptclib/inetmail.h	2007-11-29 09:17:08 UTC (rev 19007)
+++ ptlib/trunk/include/ptclib/inetmail.h	2007-11-29 09:17:41 UTC (rev 19008)
@@ -67,7 +67,7 @@
     capabilities, but these two will give a basic SMTP server functionality.
 
     The server socket thread would continuously call the
-    <A>ProcessMessage()</A> function until it returns FALSE. This will then
+    <A>ProcessMessage()</A> function until it returns PFalse. This will then
     call the appropriate virtual function on parsing the SMTP protocol.
 */
 class PSMTP : public PInternetProtocol
@@ -128,9 +128,9 @@
     /** Close the socket, and if connected as a client, QUITs from server.
 
        @return
-       TRUE if the channel was closed and the QUIT accepted by the server.
+       PTrue if the channel was closed and the QUIT accepted by the server.
      */
-    virtual BOOL Close();
+    virtual PBoolean Close();
 
 
   // New functions for class.
@@ -139,9 +139,9 @@
         and a common method is found
 
        @return
-       TRUE if logged in.
+       PTrue if logged in.
      */
-    BOOL LogIn(
+    PBoolean LogIn(
       const PString & username,   ///< User name on remote system.
       const PString & password    ///< Password for user name.
     );
@@ -152,39 +152,39 @@

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19015] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-29 11:49

Revision: 19015
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19015&view=rev
Author:   rjongbloed
Date:     2007-11-29 03:49:20 -0800 (Thu, 29 Nov 2007)

Log Message:
-----------
Fixed version numbers in documentation

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/configure.ac
    ptlib/trunk/version.h

Added Paths:
-----------
    ptlib/trunk/ptlib_cfg.dxy.in

Removed Paths:
-------------
    ptlib/trunk/ptlib_cfg.dxy

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2007-11-29 11:37:43 UTC (rev 19014)
+++ ptlib/trunk/configure	2007-11-29 11:49:20 UTC (rev 19015)
@@ -1,55 +1,26 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.59.
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
+# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -58,43 +29,8 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
 # Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
+$as_unset ENV MAIL MAILPATH
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -108,19 +44,18 @@
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+    $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -128,388 +63,157 @@
 
 
 # Name of the executable.
-as_me=`$as_basename -- "$0" ||
+as_me=`$as_basename "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
 
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
 
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
 	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
+	   if ("$as_dir/$as_base" -c '
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
 
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@... about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
     sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
       N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
       t loop
-      s/-\n.*//
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
     ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
+  chmod +x $as_me.lineno ||
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
   # Exit status is that of the last command.
   exit
 }
 
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
     as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+rm -f conf$$ conf$$.exe conf$$.file
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
@@ -518,28 +222,7 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -548,27 +231,39 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
 
-exec 7<&0 </dev/null 6>&1
+# CDPATH.
+$as_unset CDPATH
 
+
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
+exec 6>&1
+
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
-ac_clean_files=
 ac_config_libobj_dir=.
-LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
 # Identity of this package.
 PACKAGE_NAME=
 PACKAGE_TARNAME=
@@ -577,185 +272,46 @@
 PACKAGE_BUGREPORT=
 
 ac_unique_file="include/ptlib.h"
+ac_subdirs_all="$ac_subdirs_all plugins"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
+#if HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#ifdef STDC_HEADERS
+#if STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# ifdef HAVE_STDLIB_H
+# if HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
+#if HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#ifdef HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-subdirs
-CXX
-CXXFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CXX
-EXEEXT
-OBJEXT
-PTLIBDIR
-PTINSTDIR
-INSTALLPREFIX
-LIBDIR
-MAJOR_VERSION
-MINOR_VERSION
-BUILD_NUMBER
-PTLIB_VERSION
-BUILD_TYPE
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-MACHTYPE
-OSTYPE
-OSRELEASE
-TARGETDIR
-USE_GCC
-USE_PCH
-SHAREDLIBEXT
-CXXCPP
-GREP
-EGREP
-FLEX
-AR
-BISON
-HAS_REGEX
-HAS_PLUGINS
-HAS_RESOLVER
-HAS_SASL
-HAS_SASL2
-HAS_OPENLDAP
-HAS_OPENSSL
-P_STATIC_ENDLDLIBS
-P_STATIC_LDFLAGS
-HAS_EXPAT
-HAS_VXML
-HAS_JABBER
-HAS_XMLRPC
-HAS_SOAP
-HAS_TTS
-HAS_IPV6
-HAS_SDL
-HAS_VIDEO
-HAS_VIDEO_CAPTURE
-USE_SHM_VIDEO_DEVICES
-HAS_ASN
-HAS_STUN
-HAS_PIPECHAN
-HAS_DTMF
-HAS_WAVFILE
-HAS_SOCKS
-HAS_FTP
-HAS_SNMP
-HAS_TELNET
-HAS_REMCONN
-HAS_SERIAL
-HAS_POP3SMTP
-HAS_HTTP
-HAS_HTTPSVC
-HAS_CONFIG_FILE
-HAS_SOCKAGG
-HAS_VIDFILE
-HAS_APPSHARE
-HAS_AUDIO
-HAS_OSS
-HAS_ALSA
-HAS_ODBC
-STDCCFLAGS
-STDCXXFLAGS
-OPTSTDCCFLAGS
-ENDLDLIBS
-DEBUG_FLAG
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-LIBOBJS
-LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PTLIBDIR PTINSTDIR INSTALLPREFIX LIBDIR MAJOR_VERSION MINOR_VERSION BUILD_NUMBER PTLIB_VERSION BUILD_TYPE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MACHTYPE OSTYPE OSRELEASE TARGETDIR USE_GCC USE_PCH SHAREDLIBEXT CXXCPP EGREP FLEX AR BISON HAS_REGEX HAS_PLUGINS HAS_RESOLVER HAS_SASL HAS_SASL2 HAS_OPENLDAP HAS_OPENSSL P_STATIC_ENDLDLIBS P_STATIC_LDFLAGS HAS_EXPAT HAS_VXML HAS_JABBER HAS_XMLRPC HAS_SOAP HAS_TTS HAS_IPV6 HAS_SDL HAS_VIDEO HAS_VIDEO_CAPTURE USE_SHM_VIDEO_DEVICES HAS_ASN HAS_STUN HAS_PIPECHAN HAS_DTMF HAS_WAVFILE HAS_SOCKS HAS_FTP HAS_SNMP HAS_TELNET HAS_REMCONN HAS_SERIAL HAS_POP3SMTP HAS_HTTP HAS_HTTPSVC HAS_CONFIG_FILE HAS_SOCKAGG HAS_VIDFILE HAS_APPSHARE HAS_AUDIO HAS_OSS HAS_ALSA HAS_ODBC STDCCFLAGS STDCXXFLAGS OPTSTDCCFLAGS ENDLDLIBS DEBUG_FLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS'
 ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CXX
-CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CCC
-CXXCPP'
-ac_subdirs_all='plugins'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -782,48 +338,34 @@
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
+datadir='${prefix}/share'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
 
 ac_prev=
-ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
+    eval "$ac_prev=\$ac_option"
     ac_prev=
     continue
   fi
 
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -845,45 +387,33 @@
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad)
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
     datadir=$ac_optarg ;;
 
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    eval "enable_$ac_feature=no" ;;
 
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -910,12 +440,6 @@
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -940,16 +464,13 @@
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -1014,16 +535,6 @@
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -1076,20 +587,24 @@
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1120,7 +635,8 @@
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
     export $ac_envvar ;;
 
   *)
@@ -1140,21 +656,29 @@
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
 do
-  eval ac_val=\$$ac_var
+  eval ac_val=$`echo $ac_var`
   case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
 done
 
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+	      localstatedir libdir includedir oldincludedir infodir mandir
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
@@ -1179,76 +703,74 @@
 test "$silent" = yes && exec 6>/dev/null
 
 
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
+  # Try the directory containing this script, then its parent.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$0" : 'X\(//\)[^/]' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
+  if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
+  fi
 fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+   { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CXXCPP_set=${CXXCPP+set}
+ac_env_CXXCPP_value=$CXXCPP
+ac_cv_env_CXXCPP_set=${CXXCPP+set}
+ac_cv_env_CXXCPP_value=$CXXCPP
 
 #
 # Report the --help message.
@@ -1277,6 +799,9 @@
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
+_ACEOF
+
+  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
 			  [$ac_default_prefix]
@@ -1294,22 +819,15 @@
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1385,95 +903,126 @@
   CXXFLAGS    C++ compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
   CXXCPP      C++ preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 _ACEOF
-ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d $ac_dir || continue
     ac_builddir=.
 
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
+if test "$ac_dir" != .; then
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
 
 case $srcdir in
-  .)  # We are building in place.
+  .)  # No --srcdir option.  We are building in place.
     ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_srcdir/configure; then
+      echo
+      $SHELL $ac_srcdir/configure  --help=recursive
+    elif test -f $ac_srcdir/configure.ac ||
+	   test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
+    fi
+    cd $ac_popdir
   done
 fi
 
-test -n "$ac_init_help" && exit $ac_status
+test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.61
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit
+  exit 0
 fi
-cat >config.log <<_ACEOF
+exec 5>config.log
+cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
-exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1492,7 +1041,7 @@
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -1506,7 +1055,6 @@
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
-IFS=$as_save_IFS
 
 } >&5
 
@@ -1528,6 +1076,7 @@
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
+ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1538,7 +1087,7 @@
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *\'*)
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1560,7 +1109,9 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+      # Get rid of the leading space.
+      ac_sep=" "
       ;;
     esac
   done
@@ -1571,8 +1122,8 @@
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -1585,34 +1136,20 @@
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
+{
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
+	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
     *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
-    esac |
-    sort
-)
+    esac;
+}
     echo
 
     cat <<\_ASBOX
@@ -1623,28 +1160,22 @@
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
+      eval ac_val=$`echo $ac_var`
+      echo "$ac_var='"'"'$ac_val'"'"'"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
+## ------------- ##
+## Output files. ##
+## ------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
+	eval ac_val=$`echo $ac_var`
+	echo "$ac_var='"'"'$ac_val'"'"'"
       done | sort
       echo
     fi
@@ -1656,24 +1187,26 @@
 ## ----------- ##
 _ASBOX
       echo
-      cat confdefs.h
+      sed "/^$/d" confdefs.h | sort
       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+     ' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1704,17 +1237,14 @@
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
 fi
-shift
-for ac_site_file
-do
+for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1730,8 +1260,8 @@
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
     esac
   fi
 else
@@ -1743,11 +1273,12 @@
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
+for ac_var in `(set) 2>&1 |
+	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1772,7 +1303,8 @@
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1789,6 +1321,11 @@
    { (exit 1); exit 1; }; }
 fi
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -1805,64 +1342,52 @@
 
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  elif test -f "$ac_dir/install.sh"; then
+  elif test -f $ac_dir/install.sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
-  elif test -f "$ac_dir/shtool"; then
+  elif test -f $ac_dir/shtool; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 subdirs="$subdirs plugins"
 
 
-ac_ext=cpp
+ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1875,38 +1400,36 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
-IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1919,79 +1442,49 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
-IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   test -n "$ac_ct_CXX" && break
 done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@...." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@...." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
+  CXX=$ac_ct_CXX
 fi
 
-  fi
-fi
+
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+echo "$as_me:$LINENO:" \
+     "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -2016,77 +1509,47 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
 	;;
+    conftest.$ac_ext )
+	# This is the source file.
+	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
+	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	# FIXME: I believe we export ac_cv_exeext for Libtool,
+	# but it would be cool to find out if it's true.  Does anybody
+	# maintain Libtool? --akim.
+	export ac_cv_exeext
 	break;;
     * )
 	break;;
   esac
 done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
 else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2098,21 +1561,19 @@
 fi
 
 ac_exeext=$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
 
-# Check that the compiler produces executables we can run.  If not, either
+# Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
+echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2131,27 +1592,22 @@
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
+# Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2162,8 +1618,9 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
@@ -2177,14 +1634,14 @@
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2204,20 +1661,14 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
@@ -2235,12 +1686,12 @@
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2263,49 +1714,50 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_compiler_gnu=no
+ac_compiler_gnu=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+CXXFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2321,133 +1773,159 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
+ac_cv_prog_cxx_g=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+$ac_declaration
+#include <stdlib.h>
 int
 main ()
 {
-
+exit (42);
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+$ac_declaration
 int
 main ()
 {
-
+exit (42);
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2455,7 +1933,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-ac_ext=cpp
+ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2525,123 +2003,79 @@
 
 
 # Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+  ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+  ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
-fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+  ac_cv_target_alias=$target_alias
+test "x$ac_cv_target_alias" = "x" &&
+  ac_cv_target_alias=$ac_cv_host_alias
+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
-fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
+echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 
 # The aliases save the names the user supplied, while $host etc.
@@ -2847,41 +2281,41 @@
   GXX_MINOR=`echo $gcc_version | sed -e 's/[0-9][0-9]*\.//' -e 's/\..*$//'`
   GXX_PATCH=`echo $gcc_version | sed -e 's/[0-9][0-9]*\.[0-9][0-9]*\.//' -e 's/\..*$//'`
 
-    { echo "$as_me:$LINENO: checking checking if pragma implementation should be used" >&5
-echo $ECHO_N "checking checking if pragma implementation should be used... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking checking if pragma implementation should be used" >&5
+echo $ECHO_N "checking checking if pragma implementation should be used... $ECHO_C" >&6
   if test ${GXX_MAJOR} -lt 4 ; then
     if test "${need_pragma}" = "yes" ; then
       STDCCFLAGS="$STDCCFLAGS -DP_USE_PRAGMA"
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
     else
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
     fi
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
   fi
 
-    { echo "$as_me:$LINENO: checking checking if precompiled headers available" >&5
-echo $ECHO_N "checking checking if precompiled headers available... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking checking if precompiled headers available" >&5
+echo $ECHO_N "checking checking if precompiled headers available... $ECHO_C" >&6
   if test ${GXX_MAJOR} -lt 4 ; then
     enablepch=no
   else
     enablepch=yes
-    # Check whether --enable-pch was given.
+    # Check whether --enable-pch or --disable-pch was given.
 if test "${enable_pch+set}" = set; then
-  enableval=$enable_pch; enablepch=$enableval
-fi
-
+  enableval="$enable_pch"
+  enablepch=$enableval
+fi;
   fi
   if test "${enablepch}" = "yes" ; then
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
     USE_PCH=1
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
   fi
 else
   USE_GCC=no
@@ -2907,13 +2341,423 @@
 
 if test ${OSTYPE} != "Darwin" ; then
 
-ac_ext=cpp
+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+if test "${ac_cv_c_bigendian+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/param.h>
+
+int
+main ()
+{
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_bigendian=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_c_bigendian=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+# It does not; compile a test program.
+if test "$cross_compiling" = yes; then
+  # try to guess the endianness by grepping values into an object file
+  ac_cv_c_bigendian=unknown
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+int
+main ()
+{
+ _ascii (); _ebcdic ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+  ac_cv_c_bigendian=yes
+fi
+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+  if test "$ac_cv_c_bigendian" = unknown; then
+    ac_cv_c_bigendian=no
+  else
+    # finding both strings is unlikely to happen, but who knows?
+    ac_cv_c_bigendian=unknown
+  fi
+fi
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int
+main ()
+{
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_bigendian=no
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+case $ac_cv_c_bigendian in
+  yes)
+
+cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+ ;;
+  no)
+     ;;
+  *)
+    { { echo "$as_me:$LINENO: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+echo "$as_me: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
+
+  if test ${ac_cv_c_bigendian} = yes ; then
+    PBYTE_ORDER=PBIG_ENDIAN
+  else
+    PBYTE_ORDER=PLITTLE_ENDIAN
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define PBYTE_ORDER $PBYTE_ORDER
+_ACEOF
+
+fi
+
+ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+
+
+echo "$as_me:$LINENO: checking if linker accepts -felide-constructors" >&5
+echo $ECHO_N "checking if linker accepts -felide-constructors... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+int main(int ac,char **av) { return 0; }
+_ACEOF
+$CXX $CXXFLAGS -felide-constructors conftest.cc > /dev/null 2>&1
+if test $? = 0 ; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  STDCXXFLAGS="$STDCXXFLAGS -felide-constructors"
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+echo "$as_me:$LINENO: checking if linker accepts -Wreorder" >&5
+echo $ECHO_N "checking if linker accepts -Wreorder... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+int main(int ac,char **av) { return 0; }
+_ACEOF
+$CXX $CXXFLAGS -Wreorder conftest.cc > /dev/null 2>&1
+if test $? = 0 ; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  STDCXXFLAGS="$STDCXXFLAGS -Wreorder"
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
+echo "$as_me:$LINENO: checking if debug build accepts -g3 -ggdb -O0" >&5
+echo $ECHO_N "checking if debug build accepts -g3 -ggdb -O0... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+int main(int ac,char **av) { return 0; }
+_ACEOF
+$CXX  $CXXFLAGS  -g3 -ggdb -O0 conftest.cc > /dev/null 2>&1
+if test $? = 0 ; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  DEBUG_FLAG="-g3 -ggdb -O0"
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  DEBUG_FLAG="-g"
+fi
+
+
+# AC_MSG_CHECKING(if linker accepts -Woverloaded-virtual)
+# AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]])
+# $CXX $CFLAGS -Woverloaded-virtual conftest.cc > /dev/null 2>&1
+# if test $? = 0 ; then
+#   AC_MSG_RESULT(yes)
+#   STDCCFLAGS="$STDCCFLAGS -Woverloaded-virtual"
+# else
+#   AC_MSG_RESULT(no)
+# fi
+
+echo "$as_me:$LINENO: checking if compiler uses RTTI by default" >&5
+echo $ECHO_N "checking if compiler uses RTTI by default... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+
+#include <typeinfo>
+int main(int ac,char **av)
+{
+  class A
+  {
+    public:
+      virtual void fred() { }
+  };
+  class B : public A
+  {
+    public:
+      void fred() { }
+  };
+  B t;
+  A * p = dynamic_cast<A *>(&t);
+  return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  DEFAULT_RTTI=1
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+DEFAULT_RTTI=0
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "$DEFAULT_RTTI" = "1" ; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  STDCXXFLAGS="$STDCCFLAGS -rtti"
+fi
+
+GCSECTIONS=0
+
+
+if test 0 = 1 ;  then
+
+
+  echo "$as_me:$LINENO: checking if compiler accepts -ffunction-sections" >&5
+echo $ECHO_N "checking if compiler accepts -ffunction-sections... $ECHO_C" >&6
+  cat >conftest.$ac_ext <<_ACEOF
+int main(int ac,char **av) { return 0; }
+_ACEOF
+  $CXX $CFLAGS -ffunction-sections -c conftest.cc > /dev/null 2>&1
+  if test $? = 0 ; then
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+    STDCCFLAGS="$STDCCFLAGS -ffunction-sections"
+    GCSECTIONS=1
+  else
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  fi
+
+
+
+  if test $GCSECTIONS = 1; then
+    if test "${OSTYPE}" != "Darwin" ; then
+      P_STATIC_LDFLAGS="$P_STATIC_LDFLAGS -Wl,--gc-sections"
+    fi
+  fi
+fi
+
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2943,22 +2787,24 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -2967,10 +2813,9 @@
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2980,22 +2825,24 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # Broken: success on invalid input.
 continue
 else
@@ -3006,7 +2853,6 @@
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -3024,8 +2870,8 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -3048,22 +2894,24 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3072,10 +2920,9 @@
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3085,22 +2932,24 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # Broken: success on invalid input.
 continue
 else
@@ -3111,7 +2960,6 @@
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -3127,177 +2975,30 @@
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=cpp
+ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19024] ptlib/trunk

From: <rjongbloed@us...> - 2007-11-30 06:41

Revision: 19024
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19024&view=rev
Author:   rjongbloed
Date:     2007-11-29 22:40:57 -0800 (Thu, 29 Nov 2007)

Log Message:
-----------
Fixed unimplemented sound recorder volume and changed sound player volume to use mixer code the same as the recorder.

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/msos/ptlib/sound_win32.h
    ptlib/trunk/src/ptlib/msos/sound_win32.cxx

Modified: ptlib/trunk/include/ptlib/msos/ptlib/sound_win32.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/sound_win32.h	2007-11-30 05:56:36 UTC (rev 19023)
+++ ptlib/trunk/include/ptlib/msos/ptlib/sound_win32.h	2007-11-30 06:40:57 UTC (rev 19024)
@@ -157,12 +157,14 @@
     // Open with format other than PCM
 
   protected:
-    PString     deviceName;
-    Directions  direction;
-    HWAVEIN     hWaveIn;
-    HWAVEOUT    hWaveOut;
-    HANDLE      hEventDone;
-    PWaveFormat waveFormat;
+    PString      deviceName;
+    Directions   direction;
+    HWAVEIN      hWaveIn;
+    HWAVEOUT     hWaveOut;
+    HMIXER       hMixer;
+    MIXERCONTROL volumeControl;
+    HANDLE       hEventDone;
+    PWaveFormat  waveFormat;
 
     PWaveBufferArray buffers;
     PINDEX           bufferIndex;

Modified: ptlib/trunk/src/ptlib/msos/sound_win32.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/sound_win32.cxx	2007-11-30 05:56:36 UTC (rev 19023)
+++ ptlib/trunk/src/ptlib/msos/sound_win32.cxx	2007-11-30 06:40:57 UTC (rev 19024)
@@ -757,10 +757,10 @@
 }
 
 PBoolean PSoundChannelWin32::Open(const PString & device,
-                         Directions dir,
-                         unsigned numChannels,
-                         unsigned sampleRate,
-                         unsigned bitsPerSample)
+                                  Directions dir,
+                                  unsigned numChannels,
+                                  unsigned sampleRate,
+                                  unsigned bitsPerSample)
 {
   Close();
   unsigned id = 0;
@@ -775,8 +775,8 @@
 }
 
 PBoolean PSoundChannelWin32::Open(const PString & device,
-                         Directions dir,
-             const PWaveFormat& format)
+                                  Directions dir,
+                                  const PWaveFormat& format)
 {
   Close();
   unsigned id = 0;
@@ -790,6 +790,7 @@
   return OpenDevice(id);
 }
 
+
 PBoolean PSoundChannelWin32::OpenDevice(unsigned id)
 {
   Close();
@@ -801,22 +802,54 @@
 
   WAVEFORMATEX* format = (WAVEFORMATEX*) waveFormat;
 
+  MIXERLINE line;
+
   DWORD osError = MMSYSERR_BADDEVICEID;
   switch (direction) {
     case Player :
-      osError = waveOutOpen(&hWaveOut, id, format,
-                            (DWORD)hEventDone, 0, CALLBACK_EVENT);
+      osError = waveOutOpen(&hWaveOut, id, format, (DWORD)hEventDone, 0, CALLBACK_EVENT);
+      if (osError == MMSYSERR_NOERROR) {
+        mixerOpen(&hMixer, (UINT)hWaveOut, NULL, NULL, MIXER_OBJECTF_HWAVEOUT);
+        line.dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_WAVEOUT;
+      }
       break;
 
     case Recorder :
-      osError = waveInOpen(&hWaveIn, id, format,
-                           (DWORD)hEventDone, 0, CALLBACK_EVENT);
+      osError = waveInOpen(&hWaveIn, id, format, (DWORD)hEventDone, 0, CALLBACK_EVENT);
+      if (osError == MMSYSERR_NOERROR) {
+        mixerOpen(&hMixer, (UINT)hWaveIn, NULL, NULL, MIXER_OBJECTF_HWAVEIN);
+        line.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN;
+      }
       break;
   }
 
   if (osError != MMSYSERR_NOERROR)
     return SetErrorValues(NotFound, osError|PWIN32ErrorFlag);
 
+  if (hMixer != NULL) {
+    line.cbStruct = sizeof(line);
+    if (mixerGetLineInfo((HMIXEROBJ)hMixer, &line, MIXER_OBJECTF_HMIXER | MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR) {
+      mixerClose(hMixer);
+      hMixer = NULL;
+    }
+    else {
+      volumeControl.cbStruct = sizeof(volumeControl);
+
+      MIXERLINECONTROLS controls;
+      controls.cbStruct = sizeof(controls);
+      controls.dwLineID = line.dwLineID;
+      controls.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME;
+      controls.cControls = 1;
+      controls.pamxctrl = &volumeControl;
+      controls.cbmxctrl = volumeControl.cbStruct;
+
+      if (mixerGetLineControls((HMIXEROBJ)hMixer, &controls, MIXER_OBJECTF_HMIXER | MIXER_GETLINECONTROLSF_ONEBYTYPE) != MMSYSERR_NOERROR) {
+        mixerClose(hMixer);
+        hMixer = NULL;
+      }
+    }
+  }
+
   os_handle = id;
   return PTrue;
 }
@@ -887,6 +920,11 @@
 
   Abort();
 
+  if (hMixer != NULL) {
+    mixerClose(hMixer);
+    hMixer = NULL;
+  }
+
   os_handle = -1;
   return PTrue;
 }
@@ -1376,106 +1414,54 @@
 
 PBoolean PSoundChannelWin32::SetVolume(unsigned newVolume)
 {
-   if (!IsOpen())
-     return SetErrorValues(NotOpen, EBADF);
+  if (!IsOpen() || hMixer == NULL)
+    return SetErrorValues(NotOpen, EBADF);
 
-   DWORD rawVolume = newVolume*65536/100;
-   if (rawVolume > 65535)
-     rawVolume = 65535;
+  MIXERCONTROLDETAILS_UNSIGNED volume;
+  volume.dwValue = newVolume*(volumeControl.Bounds.dwMaximum - volumeControl.Bounds.dwMinimum)/100 + volumeControl.Bounds.dwMinimum;
+  if (volume.dwValue > volumeControl.Bounds.dwMaximum)
+    volume.dwValue = volumeControl.Bounds.dwMaximum;
+  else if (volume.dwValue < volumeControl.Bounds.dwMinimum)
+    volume.dwValue = volumeControl.Bounds.dwMinimum;
 
-   WAVEOUTCAPS caps;
-   if (waveOutGetDevCaps((UINT) hWaveOut, &caps, sizeof(caps)) == MMSYSERR_NOERROR) {
-     // If the device does not support L/R volume only the low word matters
-     if ((caps.dwSupport & WAVECAPS_LRVOLUME) != 0) {
-       // Mantain balance
-       DWORD oldVolume = 0;
-       if (waveOutGetVolume(hWaveOut, &oldVolume) == MMSYSERR_NOERROR) {
-         // GetVolume() is supposed to return the value we intended to set.
-         // So do the proper calculations
-         // 1. (L + R) / 2 = rawVolume      -> GetVolume() formula
-         // 2. L / R       = oldL / oldR    -> Unmodified balance
-         // Being:
-         // oldL = LOWORD(oldVolume)
-         // oldR = HIWORD(oldVolume)
-         
-         DWORD rVol, lVol;
-         DWORD oldL, oldR;
-         
-         // Old volume values
-         oldL = LOWORD(oldVolume);
-         oldR = HIWORD(oldVolume);
-         
-         lVol = rVol = 0;
-         
-         // First sort out extreme cases
-         if ( oldL == oldR )
-           rVol = lVol = rawVolume;
-         else if ( oldL == 0 )
-           rVol = rawVolume;
-         else if ( oldR == 0 )
-           lVol = rawVolume;
-         else {
-#ifndef _WIN32_WCE
-           rVol = ::MulDiv( 2 * rawVolume, oldR, oldL + oldR );
-           lVol = ::MulDiv( rVol, oldL, oldR );
-#else
-           rVol = 2 * rawVolume * oldR / ( oldL + oldR );
-           lVol = rVol * oldL / oldR;
-#endif
-         }
-         
-         rawVolume = MAKELPARAM(lVol, rVol);
-       }
-       else {
-         // Couldn't get current volume. Assume centered balance
-         rawVolume = MAKELPARAM(rawVolume, rawVolume);
-       }
-     }
-   }
-   else {
-     // Couldn't get device caps. Assume centered balance
-     // If the device does not support independant L/R volume
-     // the high-order word (R) is ignored
-     rawVolume = MAKELPARAM(rawVolume, rawVolume);
-   }
+  MIXERCONTROLDETAILS details;
+  details.cbStruct = sizeof(details);
+  details.dwControlID = volumeControl.dwControlID;
+  details.cChannels = 1;
+  details.cMultipleItems = 0;
+  details.cbDetails = sizeof(volume);
+  details.paDetails = &volume;
 
-   if (direction == Recorder) {
-     // Does not appear to be an input volume!!
-   }
-   else {
-     DWORD osError = waveOutSetVolume(hWaveOut, rawVolume);
-     if (osError != MMSYSERR_NOERROR)
-       return SetErrorValues(Miscellaneous, osError|PWIN32ErrorFlag);
-   }
+  MMRESULT result = mixerSetControlDetails((HMIXEROBJ)hMixer, &details, MIXER_OBJECTF_HMIXER | MIXER_SETCONTROLDETAILSF_VALUE);
+  if (result != MMSYSERR_NOERROR)
+    return SetErrorValues(Miscellaneous, result|PWIN32ErrorFlag);
 
-   return PTrue;
+  return true;
 }
 
 
 
 PBoolean PSoundChannelWin32::GetVolume(unsigned & oldVolume)
 {
-   if (!IsOpen())
-     return SetErrorValues(NotOpen, EBADF);
+  if (!IsOpen() || hMixer == NULL)
+    return SetErrorValues(NotOpen, EBADF);
 
-   DWORD rawVolume = 0;
+  MIXERCONTROLDETAILS_UNSIGNED volume;
 
-   if (direction == Recorder) {
-     // Does not appear to be an input volume!!
-   }
-   else {
-     DWORD osError = waveOutGetVolume(hWaveOut, &rawVolume);
-     if (osError != MMSYSERR_NOERROR)
-       return SetErrorValues(Miscellaneous, osError|PWIN32ErrorFlag);
-   }
+  MIXERCONTROLDETAILS details;
+  details.cbStruct = sizeof(details);
+  details.dwControlID = volumeControl.dwControlID;
+  details.cChannels = 1;
+  details.cMultipleItems = 0;
+  details.cbDetails = sizeof(volume);
+  details.paDetails = &volume;
 
-   WAVEOUTCAPS caps;
-   if (waveOutGetDevCaps((UINT) hWaveOut, &caps, sizeof(caps)) == MMSYSERR_NOERROR &&
-                                               (caps.dwSupport & WAVECAPS_LRVOLUME) != 0)
-     rawVolume = (HIWORD(rawVolume) + LOWORD(rawVolume)) / 2;
+  MMRESULT result = mixerSetControlDetails((HMIXEROBJ)hMixer, &details, MIXER_OBJECTF_HMIXER | MIXER_SETCONTROLDETAILSF_VALUE);
+  if (result != MMSYSERR_NOERROR)
+    return SetErrorValues(Miscellaneous, result|PWIN32ErrorFlag);
 
-   oldVolume = rawVolume*100/65536;
-   return PTrue;
+  oldVolume = 100*(volume.dwValue - volumeControl.Bounds.dwMinimum)/(volumeControl.Bounds.dwMaximum - volumeControl.Bounds.dwMinimum);
+  return true;
 }
 
 // End of File ///////////////////////////////////////////////////////////////


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19029] ptlib/trunk

From: <csoutheren@us...> - 2007-12-03 01:21

Revision: 19029
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19029&view=rev
Author:   csoutheren
Date:     2007-12-02 17:20:55 -0800 (Sun, 02 Dec 2007)

Log Message:
-----------
Fixed support for Sparc
Thanks to Mark Linimon

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/configure.ac

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2007-12-03 00:51:01 UTC (rev 19028)
+++ ptlib/trunk/configure	2007-12-03 01:20:55 UTC (rev 19029)
@@ -2185,7 +2185,9 @@
                    LIB64=1 ;
 		   ;;
 
-   sparc )         MACHTYPE=sparc ;
+   sparc|sparc64 ) MACHTYPE=sparc ;
+		   P_64BIT=1 ;
+                   LIB64=1 ;
 		   ;;
 
    powerpc )       MACHTYPE=ppc ;

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2007-12-03 00:51:01 UTC (rev 19028)
+++ ptlib/trunk/configure.ac	2007-12-03 01:20:55 UTC (rev 19029)
@@ -165,7 +165,9 @@
                    LIB64=1 ;
 		   ;;
 
-   sparc )         MACHTYPE=sparc ;
+   sparc|sparc64 ) MACHTYPE=sparc ;
+		   P_64BIT=1 ;
+                   LIB64=1 ;
 		   ;;
 
    powerpc )       MACHTYPE=ppc ;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19032] ptlib/trunk

From: <rjongbloed@us...> - 2007-12-03 11:08

Revision: 19032
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19032&view=rev
Author:   rjongbloed
Date:     2007-12-03 03:08:47 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
PBoolean'ed application video input device.
Moved global type into PVideInput scope and also change it to utilise an existing class that had exactly the same information in it.

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/pvfiledev.h
    ptlib/trunk/include/ptlib/msos/ptlib/vidinput_app.h
    ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
    ptlib/trunk/include/ptlib/videoio.h
    ptlib/trunk/samples/vidtest/main.cxx
    ptlib/trunk/src/ptlib/common/vfakeio.cxx
    ptlib/trunk/src/ptlib/common/videoio.cxx
    ptlib/trunk/src/ptlib/msos/vfw.cxx
    ptlib/trunk/src/ptlib/msos/vidinput_app.cxx

Modified: ptlib/trunk/include/ptclib/pvfiledev.h
===================================================================
--- ptlib/trunk/include/ptclib/pvfiledev.h	2007-12-03 08:50:19 UTC (rev 19031)
+++ ptlib/trunk/include/ptclib/pvfiledev.h	2007-12-03 11:08:47 UTC (rev 19032)
@@ -113,9 +113,9 @@
     /**Retrieve a list of Device Capabilities
       */
     static bool GetDeviceCapabilities(
-      const PString & /*deviceName*/,           ///< Name of device
-      InputDeviceCapabilities * /*caps*/        ///< List of supported capabilities
-    )  { return false; }
+      const PString & /*deviceName*/, ///< Name of device
+      Capabilities * /*caps*/         ///< List of supported capabilities
+    ) { return false; }
 
     /**Get the maximum frame size in bytes.
 

Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_app.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_app.h	2007-12-03 08:50:19 UTC (rev 19031)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_app.h	2007-12-03 11:08:47 UTC (rev 19032)
@@ -20,11 +20,13 @@
  *
  * Contributor(s): ______________________________________.
  *
- * $Revision$
- * $Author$
- * $Date$
- */
+ * $Revision$
+ * $Author$
+ * $Date$
+ */
 
+#include <ptbuildopts.h>
+
 #ifdef P_APPSHARE
 
 #define P_FORCE_STATIC_PLUGIN
@@ -58,39 +60,39 @@
     virtual PStringList GetDeviceNames() const
       { return GetInputDeviceNames(); }
 
-	/**Retrieve a list of Device Capabilities
-	  */
-	static BOOL GetDeviceCapabilities(
-      const PString & deviceName,           ///< Name of device
-	  InputDeviceCapabilities * caps        ///< List of supported capabilities
-	);
+    /**Retrieve a list of Device Capabilities
+    */
+    static PBoolean GetDeviceCapabilities(
+      const PString & deviceName, ///< Name of device
+      Capabilities * caps         ///< List of supported capabilities
+    );
 
     /**Open the device given the device name.
       */
-    virtual BOOL Open(
+    virtual PBoolean Open(
       const PString & DeviceName,   ///< Device name to open
-      BOOL startImmediate = TRUE    ///< Immediately start device
+      PBoolean startImmediate = TRUE    ///< Immediately start device
     );
 
     /**Determine if the device is currently open.
       */
-    virtual BOOL IsOpen();
+    virtual PBoolean IsOpen();
 
     /**Close the device.
       */
-    virtual BOOL Close();
+    virtual PBoolean Close();
 
     /**Start the video device I/O.
       */
-    virtual BOOL Start();
+    virtual PBoolean Start();
 
     /**Stop the video device I/O capture.
       */
-    virtual BOOL Stop();
+    virtual PBoolean Stop();
 
     /**Determine if the video device I/O capture is in progress.
       */
-    virtual BOOL IsCapturing();
+    virtual PBoolean IsCapturing();
 
     /**Set the colour format to be used.
        Note that this function does not do any conversion. If it returns TRUE
@@ -102,7 +104,7 @@
        Default behaviour sets the value of the colourFormat variable and then
        returns TRUE.
     */
-    virtual BOOL SetColourFormat(
+    virtual PBoolean SetColourFormat(
       const PString & colourFormat ///< New colour format for device.
     );
 
@@ -111,7 +113,7 @@
        Default behaviour sets the value of the frameRate variable and then
        returns TRUE.
     */
-    virtual BOOL SetFrameRate(
+    virtual PBoolean SetFrameRate(
       unsigned rate  ///< Frames  per second
     );
 
@@ -123,7 +125,7 @@
        Default behaviour sets the frameWidth and frameHeight variables and
        returns TRUE.
     */
-    virtual BOOL SetFrameSize(
+    virtual PBoolean SetFrameSize(
       unsigned width,   ///< New width of frame
       unsigned height   ///< New height of frame
     );
@@ -137,43 +139,43 @@
 
     /**Grab a frame, after a delay as specified by the frame rate.
       */
-    virtual BOOL GetFrameData(
+    virtual PBoolean GetFrameData(
       BYTE * buffer,                 ///< Buffer to receive frame
       PINDEX * bytesReturned         ///< OPtional bytes returned.
     );
 
     /**Grab a frame. Do not delay according to the current frame rate parameter.
       */
-    virtual BOOL GetFrameDataNoDelay(
+    virtual PBoolean GetFrameDataNoDelay(
       BYTE * buffer,                 ///< Buffer to receive frame
       PINDEX * bytesReturned         ///< OPtional bytes returned.
     );
 
     /**Try all known video formats & see which ones are accepted by the video driver
      */
-    virtual BOOL TestAllFormats();
+    virtual PBoolean TestAllFormats();
 
     /**Set the video channel (not used)
       */
-    virtual BOOL SetChannel(int newChannel);
+    virtual PBoolean SetChannel(int newChannel);
 
-	/**Set the Handle of the window you wish to capture
-	  */
-	void AttachCaptureWindow(
-		    HWND _hwnd,            ///< Handle of the window to capture
-			BOOL _client = TRUE    ///< Only capture Client area and not caption
-	);
+    /**Set the Handle of the window you wish to capture
+      */
+    void AttachCaptureWindow(
+      HWND _hwnd,            ///< Handle of the window to capture
+      bool _client = TRUE    ///< Only capture Client area and not caption
+    );
 
   protected:
-	  HWND m_hWnd;               ///< Handle of Window to Capture
-	  BOOL m_client;             ///< Capture the client area only
+      HWND m_hWnd;               ///< Handle of Window to Capture
+      bool m_client;             ///< Capture the client area only
 
-	  PMutex lastFrameMutex;     ///< Frame Grab Mutex
+      PMutex lastFrameMutex;     ///< Frame Grab Mutex
       PAdaptiveDelay grabDelay;  ///< Frame Grab delay
+};
 
 
-};
-
 PWLIB_STATIC_LOAD_PLUGIN(Application, PVideoInputDevice);
 
+
 #endif // P_APPSHARE

Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2007-12-03 08:50:19 UTC (rev 19031)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2007-12-03 11:08:47 UTC (rev 19032)
@@ -47,7 +47,6 @@
 #include <uuids.h>
 #include <control.h>
 
-#ifdef __MINGW32__
 static void DeleteMediaType(AM_MEDIA_TYPE *pmt);
 
 // 30323449-0000-0010-8000-00AA00389B71            MEDIASUBTYPE_None
@@ -81,9 +80,6 @@
     extern const CLSID CLSID_NullRenderer;
 };
 
-#else
-#include <Qedit.h>
-#endif
 
 /**This class defines a video input device.
  */
@@ -116,9 +112,9 @@
 
     /**Retrieve a list of Device Capabilities
      */
-    static BOOL GetDeviceCapabilities(
-          const PString & deviceName,           ///< Name of device
-	  InputDeviceCapabilities * caps        ///< List of supported capabilities
+    static PBoolean GetDeviceCapabilities(
+      const PString & deviceName, ///< Name of device
+      Capabilities * caps         ///< List of supported capabilities
     );
 
 

Modified: ptlib/trunk/include/ptlib/videoio.h
===================================================================
--- ptlib/trunk/include/ptlib/videoio.h	2007-12-03 08:50:19 UTC (rev 19031)
+++ ptlib/trunk/include/ptlib/videoio.h	2007-12-03 11:08:47 UTC (rev 19032)
@@ -742,16 +742,7 @@
 
 #endif // SHOULD_BE_MOVED_TO_PLUGIN
 
-typedef struct {
-public:
-	unsigned      height;
-	unsigned      width;
-	const char*   format;
-	double        fps;
-} InputDeviceCapability; 
 
-typedef std::list<InputDeviceCapability>  InputDeviceCapabilities;
-
 /**This class defines a video input device.
  */
 class PVideoInputDevice : public PVideoDevice
@@ -823,11 +814,13 @@
       PBoolean startImmediate = PTrue          ///< Immediately start display
     );
 
+    typedef std::list<PVideoFrameInfo> Capabilities;
+
     /**Retrieve a list of Device Capabilities
       */
     static PBoolean GetDeviceCapabilities(
       const PString & deviceName,           ///< Name of device
-      InputDeviceCapabilities * caps,       ///< List of supported capabilities
+      Capabilities * capabilities,          ///< List of supported capabilities
       PPluginManager * pluginMgr = NULL     ///< Plug in manager, use default if NULL
     );
 
@@ -836,7 +829,7 @@
     static PBoolean GetDeviceCapabilities(
       const PString & deviceName,           ///< Name of device
       const PString & driverName,           ///< Device Driver
-      InputDeviceCapabilities * caps,       ///< List of supported capabilities
+      Capabilities * caps,                  ///< List of supported capabilities
       PPluginManager * pluginMgr = NULL     ///< Plug in manager, use default if NULL
     );
 
@@ -894,8 +887,8 @@
   public:
     virtual PObject *   CreateInstance(int /*userData*/) const { return new className; }
     virtual PStringList GetDeviceNames(int /*userData*/) const { return className::GetInputDeviceNames(); }
-	virtual bool GetDeviceCapabilities(const PString & deviceName, void * caps) const
-	                       { return className::GetDeviceCapabilities(deviceName,(InputDeviceCapabilities *)caps); }
+    virtual bool GetDeviceCapabilities(const PString & deviceName, void * caps) const
+      { return className::GetDeviceCapabilities(deviceName, (PVideoInputDevice::Capabilities *)caps); }
 };
 
 #define PCREATE_VIDINPUT_PLUGIN(name) \

Modified: ptlib/trunk/samples/vidtest/main.cxx
===================================================================
--- ptlib/trunk/samples/vidtest/main.cxx	2007-12-03 08:50:19 UTC (rev 19031)
+++ ptlib/trunk/samples/vidtest/main.cxx	2007-12-03 11:08:47 UTC (rev 19032)
@@ -125,16 +125,15 @@
   if (inputDeviceName.IsEmpty())
     inputDeviceName = devices[0];
 
-  InputDeviceCapabilities caps;
-   if (PVideoInputDevice::GetDeviceCapabilities(inputDeviceName,inputDriverName,&caps)) {
-		  cout << "Grabber " << inputDeviceName << " capabilities." << endl;
-	  for (std::list<InputDeviceCapability>::const_iterator r = caps.begin(); r != caps.end(); ++r) {
-		  cout << "        w: " << r->width << " h: " << r->height << " fmt: " << r->format << " fps: " << r->fps << endl;
-	  }
-	  cout << endl;
-   } else {
-     cout << "InputDevice " << inputDeviceName << " capabilities not Available." << endl;
-   }
+  PVideoInputDevice::Capabilities caps;
+  if (PVideoInputDevice::GetDeviceCapabilities(inputDeviceName,inputDriverName,&caps)) {
+    cout << "Grabber " << inputDeviceName << " capabilities." << endl;
+    for (PVideoInputDevice::Capabilities::const_iterator r = caps.begin(); r != caps.end(); ++r)
+      cout << "    " << r->GetColourFormat() << ' ' << r->GetFrameWidth() << 'x' << r->GetFrameHeight() << ' ' << r->GetFrameRate() << "fps\n";
+    cout << endl;
+  }
+  else
+    cout << "Input device " << inputDeviceName << " capabilities not available." << endl;
     
   if (grabber == NULL)
     grabber = PVideoInputDevice::CreateDeviceByName(inputDeviceName);

Modified: ptlib/trunk/src/ptlib/common/vfakeio.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/vfakeio.cxx	2007-12-03 08:50:19 UTC (rev 19031)
+++ ptlib/trunk/src/ptlib/common/vfakeio.cxx	2007-12-03 11:08:47 UTC (rev 19032)
@@ -1344,9 +1344,9 @@
     /**Retrieve a list of Device Capabilities
       */
     static bool GetDeviceCapabilities(
-      const PString & /*deviceName*/,           ///< Name of device
-      InputDeviceCapabilities * /*caps*/        ///< List of supported capabilities
-    )  { return false; }
+      const PString & /*deviceName*/, ///< Name of device
+      Capabilities * /*caps*/         ///< List of supported capabilities
+    ) { return false; }
 
     /**Get the maximum frame size in bytes.
 

Modified: ptlib/trunk/src/ptlib/common/videoio.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/videoio.cxx	2007-12-03 08:50:19 UTC (rev 19031)
+++ ptlib/trunk/src/ptlib/common/videoio.cxx	2007-12-03 11:08:47 UTC (rev 19032)
@@ -1128,17 +1128,19 @@
   return (PVideoInputDevice *)pluginMgr->CreatePluginsDeviceByName(deviceName, videoInputPluginBaseClass,0,driverName);
 }
 
-PBoolean PVideoInputDevice::GetDeviceCapabilities(const PString & deviceName,InputDeviceCapabilities * caps, PPluginManager * pluginMgr)
+
+PBoolean PVideoInputDevice::GetDeviceCapabilities(const PString & deviceName, Capabilities * caps, PPluginManager * pluginMgr)
 {
-	return GetDeviceCapabilities(deviceName, "*",caps,pluginMgr);
+  return GetDeviceCapabilities(deviceName, "*", caps, pluginMgr);
 }
 
-PBoolean PVideoInputDevice::GetDeviceCapabilities(const PString & deviceName,const PString & driverName, InputDeviceCapabilities * caps, PPluginManager * pluginMgr)
+
+PBoolean PVideoInputDevice::GetDeviceCapabilities(const PString & deviceName, const PString & driverName, Capabilities * caps, PPluginManager * pluginMgr)
 {
   if (pluginMgr == NULL)
     pluginMgr = &PPluginManager::GetPluginManager();
 
-  return pluginMgr->GetPluginsDeviceCapabilities(videoInputPluginBaseClass,driverName,deviceName, (void *)caps);
+  return pluginMgr->GetPluginsDeviceCapabilities(videoInputPluginBaseClass,driverName,deviceName, caps);
 }
 
 

Modified: ptlib/trunk/src/ptlib/msos/vfw.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vfw.cxx	2007-12-03 08:50:19 UTC (rev 19031)
+++ ptlib/trunk/src/ptlib/msos/vfw.cxx	2007-12-03 11:08:47 UTC (rev 19032)
@@ -203,9 +203,9 @@
     /**Retrieve a list of Device Capabilities
       */
     static bool GetDeviceCapabilities(
-      const PString & /*deviceName*/,           ///< Name of device
-      InputDeviceCapabilities * /*caps*/        ///< List of supported capabilities
-    )  { return false; }
+      const PString & /*deviceName*/, ///< Name of device
+      Capabilities * /*caps*/         ///< List of supported capabilities
+    ) { return false; }
 
     /**Open the device given the device name.
       */

Modified: ptlib/trunk/src/ptlib/msos/vidinput_app.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_app.cxx	2007-12-03 08:50:19 UTC (rev 19031)
+++ ptlib/trunk/src/ptlib/msos/vidinput_app.cxx	2007-12-03 11:08:47 UTC (rev 19032)
@@ -19,10 +19,10 @@
  *
  * Contributor(s): ______________________________________.
  *
- * $Revision$
- * $Author$
- * $Date$
- */
+ * $Revision$
+ * $Author$
+ * $Date$
+ */
 
 
 #include <ptlib.h>
@@ -46,7 +46,7 @@
     virtual PObject *   CreateInstance(int /*userData*/) const { return new PVideoInputDevice_Application; }
     virtual PStringList GetDeviceNames(int /*userData*/) const { return PVideoInputDevice_Application::GetInputDeviceNames(); }
     virtual bool GetDeviceCapabilities(const PString & deviceName, void * caps) const
-	        { return PVideoInputDevice_Application::GetDeviceCapabilities(deviceName,(InputDeviceCapabilities *)caps); }
+      { return PVideoInputDevice_Application::GetDeviceCapabilities(deviceName, (PVideoInputDevice::Capabilities *)caps); }
 
 } PVideoInputDevice_Application_descriptor;
 
@@ -58,7 +58,7 @@
 
 PVideoInputDevice_Application::PVideoInputDevice_Application()
 {
-	m_client = TRUE;
+    m_client = true;
     preferredColourFormat = "BGR24";  
 }
 
@@ -68,25 +68,25 @@
     return PString("Application");
 }
 
-BOOL PVideoInputDevice_Application::GetDeviceCapabilities(const PString & /*deviceName*/,InputDeviceCapabilities * /*caps*/)  
+PBoolean PVideoInputDevice_Application::GetDeviceCapabilities(const PString & /*deviceName*/, Capabilities * /*caps*/)  
 { 
-    return FALSE; 
+    return false; 
 }
 
 void CaptureScreenToBYTEArray(LPRECT lpRect, PBYTEArray & array)
 {
-	HDC         hScrDC, hMemDC;         // screen DC and memory DC     
-	int         nX, nY, nX2, nY2;       // coordinates of rectangle to grab     
-	int         nWidth, nHeight;        // DIB width and height     
-	int         xScrn, yScrn;           // screen resolution      
+    HDC         hScrDC, hMemDC;         // screen DC and memory DC     
+    int         nX, nY, nX2, nY2;       // coordinates of rectangle to grab     
+    int         nWidth, nHeight;        // DIB width and height     
+    int         xScrn, yScrn;           // screen resolution      
 
-	HGDIOBJ     hOldBitmap , hBitmap;
-		
-		// check for an empty rectangle 
+    HGDIOBJ     hOldBitmap , hBitmap;
+        
+        // check for an empty rectangle 
     if (IsRectEmpty(lpRect))       
-	   return;      
-	   // create a DC for the screen and create     
-	   // a memory DC compatible to screen DC          
+       return;      
+       // create a DC for the screen and create     
+       // a memory DC compatible to screen DC          
 
    hScrDC = CreateDC("DISPLAY", NULL, NULL, NULL);     
    hMemDC = CreateCompatibleDC(hScrDC);      // get points of rectangle to grab  
@@ -102,7 +102,7 @@
    //make sure bitmap rectangle is visible      
    
    if (nX < 0)         
-	  nX = 0;     
+      nX = 0;     
    
    if (nY < 0)         
       nY = 0;     
@@ -134,7 +134,7 @@
    hBitmap = SelectObject(hMemDC, hOldBitmap);    
 
    // now we have a screencapture to bitmap
-   BITMAPINFO	bmpInfo;
+   BITMAPINFO    bmpInfo;
    bmpInfo.bmiHeader.biBitCount=0;
    bmpInfo.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
    GetDIBits(hMemDC,(HBITMAP)hBitmap,0,0,NULL,&bmpInfo,DIB_RGB_COLORS);
@@ -148,80 +148,77 @@
    DeleteDC(hMemDC);      
 }
 
-void PVideoInputDevice_Application::AttachCaptureWindow(HWND _hwnd,BOOL _client)
+void PVideoInputDevice_Application::AttachCaptureWindow(HWND _hwnd, bool _client)
 {
     m_hWnd = _hwnd;
-	m_client = _client;
+    m_client = _client;
 }
 
-BOOL PVideoInputDevice_Application::Open(
-      const PString & /*DeviceName*/, 
-      BOOL /*startImmediate*/     
-    )
+PBoolean PVideoInputDevice_Application::Open(const PString & /*DeviceName*/, PBoolean /*startImmediate*/)
 {
-	Close();
+    Close();
 
-	if (!m_hWnd) {
-		PTRACE(4,"APP/tOpen Fail no Window to capture specified!");
-		return FALSE;
-	}
+    if (!m_hWnd) {
+        PTRACE(4,"APP/tOpen Fail no Window to capture specified!");
+        return false;
+    }
 
-	RECT _rect;
+    RECT _rect;
     ::GetWindowRect(m_hWnd,&_rect);
-	 PVideoDevice::SetFrameSize(_rect.right,_rect.bottom);
+     PVideoDevice::SetFrameSize(_rect.right,_rect.bottom);
 
-	return TRUE;
+    return true;
 }
 
-BOOL PVideoInputDevice_Application::IsOpen()
+PBoolean PVideoInputDevice_Application::IsOpen()
 {
-	return FALSE;
+    return false;
 }
 
-BOOL PVideoInputDevice_Application::Close()
+PBoolean PVideoInputDevice_Application::Close()
 {
-	if (!IsOpen())
-		return FALSE;
+    if (!IsOpen())
+        return false;
 
-	return TRUE;
+    return true;
 }
 
-BOOL PVideoInputDevice_Application::Start()
+PBoolean PVideoInputDevice_Application::Start()
 {
-	return FALSE;
+    return false;
 }
 
-BOOL PVideoInputDevice_Application::Stop()
+PBoolean PVideoInputDevice_Application::Stop()
 {
-	return FALSE;
+    return false;
 }
 
-BOOL PVideoInputDevice_Application::IsCapturing()
+PBoolean PVideoInputDevice_Application::IsCapturing()
 {
-	return FALSE;
+    return false;
 }
 
-BOOL PVideoInputDevice_Application::SetColourFormat(
+PBoolean PVideoInputDevice_Application::SetColourFormat(
       const PString & /*ColourFormat*/ 
     )
 {
-     return TRUE;
+     return true;
 }
 
-BOOL PVideoInputDevice_Application::SetFrameRate(
+PBoolean PVideoInputDevice_Application::SetFrameRate(
       unsigned Rate 
     )
 {
-	return PVideoDevice::SetFrameRate(Rate);
+    return PVideoDevice::SetFrameRate(Rate);
 }
 
-BOOL PVideoInputDevice_Application::SetFrameSize(
+PBoolean PVideoInputDevice_Application::SetFrameSize(
       unsigned /*Width*/,   
       unsigned /*Height*/   
     )
 {
-	PTRACE(4,"APP/tFrame size cannot be set! Must be detected from Application!");
-	return TRUE;
+    PTRACE(4,"APP/tFrame size cannot be set! Must be detected from Application!");
+    return true;
 }
 
 PINDEX PVideoInputDevice_Application::GetMaxFrameBytes()
@@ -229,7 +226,7 @@
   return GetMaxFrameBytesConverted(CalculateFrameBytes(frameWidth, frameHeight, colourFormat));
 }
 
-BOOL PVideoInputDevice_Application::GetFrameData(
+PBoolean PVideoInputDevice_Application::GetFrameData(
       BYTE * buffer,                 
       PINDEX * bytesReturned   
     )
@@ -238,7 +235,7 @@
     return GetFrameDataNoDelay(buffer,bytesReturned);
 }
 
-BOOL PVideoInputDevice_Application::GetFrameDataNoDelay(
+PBoolean PVideoInputDevice_Application::GetFrameDataNoDelay(
       BYTE * buffer,                 
       PINDEX * bytesReturned  
     )
@@ -253,49 +250,49 @@
    if (!m_client) {
      ::GetWindowRect(m_hWnd,&_rect);
      if ((_rect.right != (signed)frameWidth) ||
-	    (_rect.bottom != (signed)frameHeight))
-	      PVideoDevice::SetFrameSize(_rect.right,_rect.bottom);
+        (_rect.bottom != (signed)frameHeight))
+          PVideoDevice::SetFrameSize(_rect.right,_rect.bottom);
    } else {
      ::GetClientRect(m_hWnd,&_rect);
      if ((_rect.right != (signed)frameWidth) ||
-	    (_rect.bottom != (signed)frameHeight))
-	      PVideoDevice::SetFrameSize(_rect.right,_rect.bottom);
+        (_rect.bottom != (signed)frameHeight))
+          PVideoDevice::SetFrameSize(_rect.right,_rect.bottom);
 
-	   POINT pt1,pt2;
-	     pt1.x = _rect.left;             
-	     pt1.y = _rect.top;             
-	     pt2.x = _rect.right;             
-	     pt2.y = _rect.bottom;             
-		 ::ClientToScreen(m_hWnd,&pt1);             
-		 ::ClientToScreen(m_hWnd,&pt2);             
-	     _rect.left = pt1.x;             
-	     _rect.top = pt1.y;             
-	     _rect.right = pt2.x;             
-	     _rect.bottom = pt2.y;  
+       POINT pt1,pt2;
+         pt1.x = _rect.left;             
+         pt1.y = _rect.top;             
+         pt2.x = _rect.right;             
+         pt2.y = _rect.bottom;             
+         ::ClientToScreen(m_hWnd,&pt1);             
+         ::ClientToScreen(m_hWnd,&pt2);             
+         _rect.left = pt1.x;             
+         _rect.top = pt1.y;             
+         _rect.right = pt2.x;             
+         _rect.bottom = pt2.y;  
    }
 
     PBYTEArray frame;
     CaptureScreenToBYTEArray(&_rect,frame);
 
-	bool retval = false;
-	long pBufferSize = frame.GetSize();
-	BYTE * pBuffer = frame.GetPointer();
-	
+    bool retval = false;
+    long pBufferSize = frame.GetSize();
+    BYTE * pBuffer = frame.GetPointer();
+    
    PTRACE(6,"AppInput\tBuffer obtained." << pBufferSize );
    if (pBuffer != NULL) {
   
-	// Convert the image for output
-	  if (NULL != converter) {
+    // Convert the image for output
+      if (NULL != converter) {
          retval = converter->Convert(pBuffer,buffer, bytesReturned);
          PTRACE(6,"AppInput\tBuffer converted." << *bytesReturned );
-	  } else {
+      } else {
 
          PTRACE(6,"AppInput\tBuffer copied." << pBufferSize );
          memcpy(buffer, pBuffer, pBufferSize);
-	     if (buffer != NULL)
-		   *bytesReturned = pBufferSize;
-	    retval = true;
-	  }
+         if (buffer != NULL)
+           *bytesReturned = pBufferSize;
+        retval = true;
+      }
    }
 
   PTRACE(6,"App\tBuffer Transcoded "  << retval);
@@ -304,15 +301,15 @@
 }
 
 
-BOOL PVideoInputDevice_Application::TestAllFormats()
+PBoolean PVideoInputDevice_Application::TestAllFormats()
 {
-	return TRUE;
+    return true;
 }
 
-BOOL PVideoInputDevice_Application::SetChannel(int /*newChannel*/)
+PBoolean PVideoInputDevice_Application::SetChannel(int /*newChannel*/)
 {
 
-  return TRUE;
+  return true;
 }
 
 #endif  // P_APPSHARE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19033] ptlib/trunk

From: <rjongbloed@us...> - 2007-12-03 11:53

Revision: 19033
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19033&view=rev
Author:   rjongbloed
Date:     2007-12-03 03:53:36 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
Completed addition of Direct Show video grabber, including configure detection for headers and libraries and inclusion in DevStudio builds.
Fixed various compiler warnings in directshow grabber.

Modified Paths:
--------------
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in
    ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
    ptlib/trunk/include/ptlib/msos/ptlib.ignore
    ptlib/trunk/src/ptlib/msos/Console_2005.vcproj
    ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2007-12-03 11:08:47 UTC (rev 19032)
+++ ptlib/trunk/configure.ac	2007-12-03 11:53:36 UTC (rev 19033)
@@ -2300,6 +2300,19 @@
 
 
 dnl ########################################################################
+dnl look for Direct Show (video)
+
+dnl MSWIN_DISPLAY    dshow,Direct Show Support
+dnl MSWIN_CHECK_FILE dshow,include\dshow.h,P_DIRECTSHOW=1
+dnl MSWIN_DIR_SYMBOL dshow,DIRECTSHOW_DIR
+dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft SDKs\Windows\v6.0
+dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft Visual Studio 8\VC\PlatformSDK\
+dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\
+dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft SDK\
+dnl MSWIN_CHECK_DIR  dshow,\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\
+
+
+dnl ########################################################################
 dnl check for various functions
 dnl According to Andre Schulze <as8@...>
 dnl Solaris swab should not be used

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2007-12-03 11:08:47 UTC (rev 19032)
+++ ptlib/trunk/include/ptbuildopts.h.in	2007-12-03 11:53:36 UTC (rev 19033)
@@ -445,7 +445,10 @@
 //
 // APP Share Input 
 //
+
+#ifndef _WIN32_WCE
 #undef P_APPSHARE
+#endif
 
 #if defined(_MSC_VER) && P_APPSHARE
 #pragma include_alias(<ptlib/vidinput_app.h>, <ptlib/msos/ptlib/vidinput_app.h>)
@@ -518,7 +521,6 @@
 //
 // DirectX Support (Windows only)
 //
-#undef P_DIRECTSOUND_WINCE
 
 #ifndef _WIN32_WCE
 #undef P_DIRECTSOUND
@@ -526,8 +528,10 @@
 #undef P_VFW_CAPTURE
 #endif
 
-#if defined(_MSC_VER) && (defined(P_DIRECTSOUND) || defined(P_DIRECTSHOW)) && !defined(P_DIRECTSOUND_WINCE)
+#undef P_DIRECTSOUND_WINCE
 
+#if defined(_MSC_VER) && defined(P_DIRECTSOUND) && !defined(P_DIRECTSOUND_WINCE)
+
 #pragma include_alias(<dsound.h>, <@DIRECTX_DIR@...>)
 
 #undef P_DIRECTSOUND_LIB64
@@ -542,6 +546,24 @@
 #endif
 
 
+#if defined(_MSC_VER) && defined(P_DIRECTSHOW)
+
+#pragma include_alias(<ddraw.h>, <@DIRECTSHOW_DIR@...>)
+#pragma include_alias(<dshow.h>, <@DIRECTSHOW_DIR@...>)
+#pragma include_alias(<amvideo.h>, <@DIRECTSHOW_DIR@...>)
+#pragma include_alias(<evcode.h>, <@DIRECTSHOW_DIR@...>)
+#pragma include_alias(<errors.h>, <@DIRECTSHOW_DIR@...>)
+#pragma include_alias(<edevdefs.h>, <@DIRECTSHOW_DIR@...>)
+#pragma include_alias(<audevcod.h>, <@DIRECTSHOW_DIR@...>)
+#pragma include_alias(<dvdevcod.h>, <@DIRECTSHOW_DIR@...>)
+#pragma include_alias(<VFWMSGS.H>, <@DIRECTSHOW_DIR@...>)
+
+#define P_DIRECTSHOW_LIBRARY1 "@DIRECTSHOW_DIR@..."
+#define P_DIRECTSHOW_LIBRARY2 "@DIRECTSHOW_DIR@..."
+
+#endif
+
+
 /////////////////////////////////////////////////
 //
 // DCOM Support (Windows only)

Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2007-12-03 11:08:47 UTC (rev 19032)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2007-12-03 11:53:36 UTC (rev 19033)
@@ -47,6 +47,7 @@
 #include <uuids.h>
 #include <control.h>
 
+
 static void DeleteMediaType(AM_MEDIA_TYPE *pmt);
 
 // 30323449-0000-0010-8000-00AA00389B71            MEDIASUBTYPE_None
@@ -56,28 +57,31 @@
 #define INTERFACE ISampleGrabberCB
 DECLARE_INTERFACE_(ISampleGrabberCB, IUnknown)
 {
-    STDMETHOD_(HRESULT, SampleCB)(THIS_ double, IMediaSample *) PURE;
-    STDMETHOD_(HRESULT, BufferCB)(THIS_ double, BYTE *, long) PURE;
+  STDMETHOD_(HRESULT, SampleCB)(THIS_ double, IMediaSample *) PURE;
+  STDMETHOD_(HRESULT, BufferCB)(THIS_ double, BYTE *, long) PURE;
 };
 
 #undef INTERFACE
 #define INTERFACE ISampleGrabber
+
 DECLARE_INTERFACE_(ISampleGrabber,IUnknown)
 {
-    STDMETHOD_(HRESULT, SetOneShot)(THIS_ BOOL) PURE;
-    STDMETHOD_(HRESULT, SetMediaType)(THIS_ AM_MEDIA_TYPE *) PURE;
-    STDMETHOD_(HRESULT, GetConnectedMediaType)(THIS_ AM_MEDIA_TYPE *) PURE;
-    STDMETHOD_(HRESULT, SetBufferSamples)(THIS_ BOOL) PURE;
-    STDMETHOD_(HRESULT, GetCurrentBuffer)(THIS_ long *, long *) PURE;
-    STDMETHOD_(HRESULT, GetCurrentSample)(THIS_ IMediaSample *) PURE;
-    STDMETHOD_(HRESULT, SetCallback)(THIS_ ISampleGrabberCB *, long) PURE;
+  STDMETHOD_(HRESULT, SetOneShot)(THIS_ BOOL) PURE;
+  STDMETHOD_(HRESULT, SetMediaType)(THIS_ AM_MEDIA_TYPE *) PURE;
+  STDMETHOD_(HRESULT, GetConnectedMediaType)(THIS_ AM_MEDIA_TYPE *) PURE;
+  STDMETHOD_(HRESULT, SetBufferSamples)(THIS_ BOOL) PURE;
+  STDMETHOD_(HRESULT, GetCurrentBuffer)(THIS_ long *, long *) PURE;
+  STDMETHOD_(HRESULT, GetCurrentSample)(THIS_ IMediaSample *) PURE;
+  STDMETHOD_(HRESULT, SetCallback)(THIS_ ISampleGrabberCB *, long) PURE;
 };
+
+
 extern "C" {
-    extern const CLSID CLSID_SampleGrabber;
-    extern const IID IID_ISampleGrabber;
-    extern const CLSID CLSID_SampleGrabberCB;
-    extern const IID IID_ISampleGrabberCB;
-    extern const CLSID CLSID_NullRenderer;
+  extern const CLSID CLSID_SampleGrabber;
+  extern const IID IID_ISampleGrabber;
+  extern const CLSID CLSID_SampleGrabberCB;
+  extern const IID IID_ISampleGrabberCB;
+  extern const CLSID CLSID_NullRenderer;
 };
 
 

Modified: ptlib/trunk/include/ptlib/msos/ptlib.ignore
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib.ignore	2007-12-03 11:08:47 UTC (rev 19032)
+++ ptlib/trunk/include/ptlib/msos/ptlib.ignore	2007-12-03 11:53:36 UTC (rev 19033)
@@ -32,4 +32,15 @@
     __GUID_6c44df74_72b9_4992_a1ec_ef996e0422d4 @15873 NONAME
     ___pobjMapEntryFirst @15874 NONAME
     ___pobjMapEntryLast @15875 NONAME
-    
\ No newline at end of file
+    _!= @22906 NONAME
+    _== @22907 NONAME
+    _IID_IAMFilterGraphCallback @22906 NONAME
+    _IsEqualGUID @22907 NONAME
+    __CT??_R0?AVbad_alloc@... @15845 NONAME
+    __CT??_R0?AVexception@... @15846 NONAME
+    __CT??_R0?AVlength_error@... @15847 NONAME
+    __CT??_R0?AVlogic_error@... @15848 NONAME
+    __CTA2?AVbad_alloc@...@@ @15849 NONAME
+    __CTA3?AVlength_error@...@@ @15850 NONAME
+    __TI2?AVbad_alloc@...@@ @15851 NONAME
+    __TI3?AVlength_error@...@@ @15852 NONAME

Modified: ptlib/trunk/src/ptlib/msos/Console_2005.vcproj
===================================================================
--- ptlib/trunk/src/ptlib/msos/Console_2005.vcproj	2007-12-03 11:08:47 UTC (rev 19032)
+++ ptlib/trunk/src/ptlib/msos/Console_2005.vcproj	2007-12-03 11:53:36 UTC (rev 19033)
@@ -3941,6 +3941,14 @@
 					</FileConfiguration>
 				</File>
 				<File
+					RelativePath=".\vidinput_app.cxx"
+					>
+				</File>
+				<File
+					RelativePath=".\vidinput_directx.cxx"
+					>
+				</File>
+				<File
 					RelativePath="win32.cxx"
 					>
 					<FileConfiguration
@@ -5662,6 +5670,14 @@
 					RelativePath="..\..\..\include\ptlib\msos\ptlib\videoio.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\msos\ptlib\vidinput_app.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\include\ptlib\msos\ptlib\vidinput_directx.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Components"

Modified: ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2007-12-03 11:08:47 UTC (rev 19032)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2007-12-03 11:53:36 UTC (rev 19033)
@@ -37,16 +37,13 @@
 #endif
 
 #ifdef _MSC_VER
-#ifndef _WIN32_WCE
-#pragma comment(lib,"strmiids.lib")
-#pragma comment(lib,"quartz.lib")
+#pragma comment(lib, P_DIRECTSHOW_LIBRARY1)
+#pragma comment(lib, P_DIRECTSHOW_LIBRARY2)
 #endif
-#endif
 
 #define SAFE_RELEASE(p)      { if(p) { (p)->Release(); (p)=NULL; } }
 
 static HRESULT SetDevice(const PString & devName, IBaseFilter ** ppSrcFilter);
-static const char *ErrorMessage(HRESULT hr);
 static char *BSTR_to_ANSI(BSTR pSrc);
 static GUID pwlib_format_to_media_format(const char *format);
 static const char *media_format_to_pwlib_format(const GUID guid);
@@ -55,6 +52,40 @@
 PCREATE_VIDINPUT_PLUGIN(DirectShow);
 
 
+#if PTRACING
+static const char *ErrorMessage(HRESULT hr)
+{
+    static char string[1024];
+    DWORD dwMsgLen;
+
+    memset(string, 0, sizeof(string));
+    dwMsgLen = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
+			      FORMAT_MESSAGE_IGNORE_INSERTS,
+			      NULL,
+			      hr,
+			      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+			      (LPSTR)string,
+			      sizeof(string)-1,
+			      NULL);
+    if (dwMsgLen)
+	return string;
+
+    memset(string, 0, sizeof(string));
+    dwMsgLen = AMGetErrorTextA(hr, string, sizeof(string));
+    if (dwMsgLen)
+	return string;
+
+#ifdef __MINGW32__  // This function is not recognised in Windows
+    snprintf(string, sizeof(string), "0x%8.8x", hr);
+	return string;
+#else
+	return PString();
+#endif
+    
+}
+#endif // PTRACING
+
+
 static void MyDeleteMediaType(AM_MEDIA_TYPE *pmt)
 {
     if (pmt == NULL)
@@ -692,7 +723,6 @@
 
 	VIDEOINFOHEADER *VideoInfo = (VIDEOINFOHEADER *)pMediaFormat->pbFormat;
 	BITMAPINFOHEADER *BitmapInfo = &(VideoInfo->bmiHeader);
-	const char *current_format = media_format_to_pwlib_format(pMediaFormat->subtype);
 	const int maxfps = (int)(10000000.0/VideoInfo->AvgTimePerFrame);
 
 	if (!wanted_format.IsEmpty() && (wanted_guid_format != pMediaFormat->subtype))
@@ -709,7 +739,7 @@
 
 	/* We have match a goo format, Use it to change the format */
 	PTRACE(1,"PVidDirectShow\tUsing setting ["<< i << "] = ("
-		<< current_format << ", "
+		<< media_format_to_pwlib_format(pMediaFormat->subtype) << ", "
 		<< BitmapInfo->biWidth << "x" << BitmapInfo->biHeight << ", "
 		<< fps << "fps, max:" << maxfps << "fps)");
 
@@ -718,8 +748,7 @@
         if (pMC)
         {
 	    hr = pMC->GetState(1000, &filterState);
-	    if (FAILED(hr))
-	        PTRACE(1, "PVidDirectShow\tGetState failed: " << ErrorMessage(hr));
+            PTRACE_IF(1, FAILED(hr), "PVidDirectShow\tGetState failed: " << ErrorMessage(hr));
 	    pMC->StopWhenReady();
         }
 
@@ -980,8 +1009,7 @@
 	long ValScaled = Min + ((Max-Min) * newValue) / 65536;
 	hr = pVideoProcAmp->Set(control, ValScaled, VideoProcAmp_Flags_Manual);
     }
-    if (FAILED(hr))
-	PTRACE(4, "PVidDirectShow\tFailed to setRange interface on " << control << " : " << ErrorMessage(hr));
+    PTRACE_IF(4, FAILED(hr), "PVidDirectShow\tFailed to setRange interface on " << control << " : " << ErrorMessage(hr));
 
     pVideoProcAmp->Release();
     return PTrue;
@@ -1038,7 +1066,7 @@
 }
 
 
-BOOL PVideoInputDevice_DirectShow::GetDeviceCapabilities(const PString & /*deviceName*/,InputDeviceCapabilities * /*caps*/)  
+PBoolean PVideoInputDevice_DirectShow::GetDeviceCapabilities(const PString & /*deviceName*/, Capabilities * /*caps*/)  
 { 
     // To do!
     return FALSE; 
@@ -1093,6 +1121,7 @@
 	    continue;
 	}
 
+#if PTRACING
 	if ((pMediaFormat->formattype == FORMAT_VideoInfo)     &&
             (pMediaFormat->cbFormat >= sizeof(VIDEOINFOHEADER)) &&
 	    (pMediaFormat->pbFormat != NULL))
@@ -1105,6 +1134,7 @@
 		    << BitmapInfo->biWidth << "x" << BitmapInfo->biHeight << ", "
 		    << (10000000.0/VideoInfo->AvgTimePerFrame) << "fps)");
 	}
+#endif
 
 	MyDeleteMediaType(pMediaFormat);
     }
@@ -1206,37 +1236,6 @@
 }
 
 
-static const char *ErrorMessage(HRESULT hr)
-{
-    static char string[1024];
-    DWORD dwMsgLen;
-
-    memset(string, 0, sizeof(string));
-    dwMsgLen = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
-			      FORMAT_MESSAGE_IGNORE_INSERTS,
-			      NULL,
-			      hr,
-			      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-			      (LPSTR)string,
-			      sizeof(string)-1,
-			      NULL);
-    if (dwMsgLen)
-	return string;
-
-    memset(string, 0, sizeof(string));
-    dwMsgLen = AMGetErrorTextA(hr, string, sizeof(string));
-    if (dwMsgLen)
-	return string;
-
-#ifdef __MINGW32__  // This function is not recognised in Windows
-    snprintf(string, sizeof(string), "0x%8.8x", hr);
-	return string;
-#else
-	return PString();
-#endif
-    
-}
-
 static HRESULT SetDevice(const PString & devName, IBaseFilter ** ppSrcFilter)
 {
     HRESULT hr;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19044] ptlib/trunk

From: <rjongbloed@us...> - 2007-12-04 04:25

Revision: 19044
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19044&view=rev
Author:   rjongbloed
Date:     2007-12-03 20:25:15 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
Fixed ignorance property

Property Changed:
----------------
    ptlib/trunk/
    ptlib/trunk/samples/ODBC/
    ptlib/trunk/samples/ThreadSafe/
    ptlib/trunk/samples/address/
    ptlib/trunk/samples/aggtest/
    ptlib/trunk/samples/audio/
    ptlib/trunk/samples/dnstest/
    ptlib/trunk/samples/dtmftest/
    ptlib/trunk/samples/emailtest/
    ptlib/trunk/samples/factory/
    ptlib/trunk/samples/find_ip/
    ptlib/trunk/samples/hello_world/
    ptlib/trunk/samples/ipv6test/
    ptlib/trunk/samples/ldaptest/
    ptlib/trunk/samples/md5/
    ptlib/trunk/samples/netif/
    ptlib/trunk/samples/ptimer/
    ptlib/trunk/samples/pxml/
    ptlib/trunk/samples/queue/
    ptlib/trunk/samples/safetest/
    ptlib/trunk/samples/serial/
    ptlib/trunk/samples/sockbundle/
    ptlib/trunk/samples/sortedlist/
    ptlib/trunk/samples/strtest/
    ptlib/trunk/samples/stunclient/
    ptlib/trunk/samples/thread/
    ptlib/trunk/samples/threadex/
    ptlib/trunk/samples/timing/
    ptlib/trunk/samples/vidtest/
    ptlib/trunk/samples/vxmltest/
    ptlib/trunk/samples/wavfile/
    ptlib/trunk/samples/xmlrpc/
    ptlib/trunk/samples/xmlrpcsrvr/
    ptlib/trunk/samples/xmppconsole/
    ptlib/trunk/samples/xmpptest/
    ptlib/trunk/src/ptclib/speex_echo/
    ptlib/trunk/src/ptlib/msos/
    ptlib/trunk/tools/MergeSym/
    ptlib/trunk/tools/StringTest/
    ptlib/trunk/tools/asnparser/
    ptlib/trunk/tools/configure/
    ptlib/trunk/tools/plugintest/


Property changes on: ptlib/trunk
___________________________________________________________________
Name: svn:ignore
   - lib html
Lib Debug Release
*.suo *.ncb *.opt *.plg *.Tags.WW
config.log config.status a.out
Makefile
bin

   + Lib
Debug
Release
*.suo
*.ncb
*.opt
*.plg
*.Tags.WW
config.log
config.status
a.out
Makefile
html
bin
lib



Property changes on: ptlib/trunk/samples/ODBC
___________________________________________________________________
Name: svn:ignore
   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/ThreadSafe
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/address
___________________________________________________________________
Name: svn:ignore
   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/aggtest
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/audio
___________________________________________________________________
Name: svn:ignore
   - lib html
Lib Debug Release
*.suo *.ncb *.opt *.plg *.Tags.WW
obj_*


   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/dnstest
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/dtmftest
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/emailtest
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/factory
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/find_ip
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/hello_world
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW
 *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/ipv6test
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/ldaptest
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/md5
___________________________________________________________________
Name: svn:ignore
   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/netif
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/ptimer
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/pxml
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/queue
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
NoTrace notrace
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/safetest
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/serial
___________________________________________________________________
Name: svn:ignore
   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/sockbundle
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/sortedlist
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/strtest
___________________________________________________________________
Name: svn:ignore
   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/stunclient
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/thread
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/threadex
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/timing
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/vidtest
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/vxmltest
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/wavfile
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/xmlrpc
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/xmlrpcsrvr
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/xmppconsole
___________________________________________________________________
Name: svn:ignore
   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/samples/xmpptest
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user
*.log

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/src/ptclib/speex_echo
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug debug
obj_*_*_r Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user
*.log

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user
*.log



Property changes on: ptlib/trunk/src/ptlib/msos
___________________________________________________________________
Name: svn:ignore
   - *.plg *.Tags.WW *.vcproj.*.user

   + *.plg
*.Tags.WW
*.user



Property changes on: ptlib/trunk/tools/MergeSym
___________________________________________________________________
Name: svn:ignore
   - Debug debug
Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user
MergeSym.dep

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/tools/StringTest
___________________________________________________________________
Name: svn:ignore
   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/tools/asnparser
___________________________________________________________________
Name: svn:ignore
   - obj_*_*_d Debug
obj_*_*_r Release
*.plg *.opt *.ncb *.Tags.WW
asn_lex.cxx
asn_grammar.output
asn_grammar.out
asn_grammar.h
asn_grammar.cxx
asn_grammar_tab.c
asn_grammar_tab.h
asnparser.ncb
asnparser.opt
asnparser.plg
test.asn test.cxx test.h

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/tools/configure
___________________________________________________________________
Name: svn:ignore
   - Debug debug
Release release
*.plg *.opt *.ncb *.Tags.WW *.vcproj.*.user

   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



Property changes on: ptlib/trunk/tools/plugintest
___________________________________________________________________
Name: svn:ignore
   + obj_*_*_d
obj_*_*_r
Debug
Release
*.plg
*.opt
*.ncb
*.Tags.WW
*.user



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19093] ptlib/trunk

From: <rjongbloed@us...> - 2007-12-14 05:52

Revision: 19093
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19093&view=rev
Author:   rjongbloed
Date:     2007-12-13 21:52:57 -0800 (Thu, 13 Dec 2007)

Log Message:
-----------
Fixed bug 1845862 - nested PTRACE will not show trace message correctly

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/thread.h
    ptlib/trunk/src/ptlib/common/osutils.cxx

Modified: ptlib/trunk/include/ptlib/thread.h
===================================================================
--- ptlib/trunk/include/ptlib/thread.h	2007-12-14 05:28:58 UTC (rev 19092)
+++ ptlib/trunk/include/ptlib/thread.h	2007-12-14 05:52:57 UTC (rev 19093)
@@ -364,8 +364,8 @@
 
   private:
 #if PTRACING
-    PStringStream traceStream;
-    unsigned      traceLevel;
+    PStack<PStringStream> traceStreams;
+    unsigned traceLevel;
     friend class PTrace;
 
     unsigned traceBlockIndentLevel;

Modified: ptlib/trunk/src/ptlib/common/osutils.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/osutils.cxx	2007-12-14 05:28:58 UTC (rev 19092)
+++ ptlib/trunk/src/ptlib/common/osutils.cxx	2007-12-14 05:52:57 UTC (rev 19093)
@@ -344,8 +344,11 @@
 
   PThread * thread = PThread::Current();
 
-  ostream & stream = thread != NULL ? (ostream &)thread->traceStream : *info.stream;
+  if (thread != NULL)
+    thread->traceStreams.Push(new PStringStream);
 
+  ostream & stream = thread != NULL ? (ostream &)thread->traceStreams.Top() : *info.stream;
+
   info.oldStreamFlags = stream.flags();
   info.oldPrecision = stream.precision();
 
@@ -424,10 +427,10 @@
   PThread * thread = PThread::Current();
 
   if (thread != NULL) {
-    PAssert(&paramStream == &thread->traceStream, PLogicError);
+    PAssert(&paramStream == &thread->traceStreams.Top(), PLogicError);
     info.Lock();
-    *info.stream << thread->traceStream;
-    thread->traceStream = PString::Empty();
+    *info.stream << thread->traceStreams.Top();
+    thread->traceStreams.Pop();
   }
   else {
     PAssert(&paramStream == info.stream, PLogicError);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19098] ptlib/trunk

From: <rjongbloed@us...> - 2007-12-16 23:21

Revision: 19098
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19098&view=rev
Author:   rjongbloed
Date:     2007-12-16 15:21:24 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
Added function to reset a PSafePtr to NULL as going "var = NULL" is ambiguous to some versions of the GCC compiler.

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/safecoll.h
    ptlib/trunk/src/ptlib/common/safecoll.cxx

Modified: ptlib/trunk/include/ptlib/safecoll.h
===================================================================
--- ptlib/trunk/include/ptlib/safecoll.h	2007-12-16 17:59:36 UTC (rev 19097)
+++ ptlib/trunk/include/ptlib/safecoll.h	2007-12-16 23:21:24 UTC (rev 19098)
@@ -490,6 +490,10 @@
 
   /**@name Operations */
   //@{
+    /**Set the pointer to NULL, unlocking/dereferencing existing pointer value.
+      */
+    void SetNULL();
+
     /**Return PTrue if pointer is NULL.
       */
     bool operator!() const { return currentObject == NULL; }

Modified: ptlib/trunk/src/ptlib/common/safecoll.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/safecoll.cxx	2007-12-16 17:59:36 UTC (rev 19097)
+++ ptlib/trunk/src/ptlib/common/safecoll.cxx	2007-12-16 23:21:24 UTC (rev 19098)
@@ -565,6 +565,17 @@
 }
 
 
+void PSafePtrBase::SetNULL()
+{
+  // lockCount ends up zero after this
+  ExitSafetyMode(WithDereference);
+
+  collection = NULL;
+  currentObject = NULL;
+  lockMode = PSafeReference;
+}
+
+
 PBoolean PSafePtrBase::SetSafetyMode(PSafetyMode mode)
 {
   if (lockMode == mode)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19128] ptlib/trunk

From: <rjongbloed@us...> - 2007-12-19 23:34

Revision: 19128
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19128&view=rev
Author:   rjongbloed
Date:     2007-12-19 15:34:25 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
Fixed flip vertical in direct show grabber to use base class functionality.

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
    ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx

Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2007-12-19 23:33:06 UTC (rev 19127)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h	2007-12-19 23:34:25 UTC (rev 19128)
@@ -268,12 +268,10 @@
     PBoolean GetDefaultFormat();
     PBoolean ListSupportedFormats();
     PBoolean InitialiseCapture();
-    void FlipVertical(BYTE *buffer);
 
     char *tempFrame;			/* Buffer used when a converter is needed */
     long frameBytes;		        /* Size of a frame in Bytes */
     int  capturing_duration;
-    PBoolean flipVertical;
     PAdaptiveDelay m_pacing;
     
     PBoolean          isCapturingNow;

Modified: ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2007-12-19 23:33:06 UTC (rev 19127)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx	2007-12-19 23:34:25 UTC (rev 19128)
@@ -124,7 +124,6 @@
   pCapture = NULL;
   pGrabber = NULL;
 
-  flipVertical = PFalse;
   isCapturingNow = PFalse;
   capturing_duration = 10000; // arbitrary large value suffices
 }
@@ -514,29 +513,7 @@
     return isCapturingNow;
 }
 
-/*
- * Flip an image vertically in place
- *
- */
-void PVideoInputDevice_DirectShow::FlipVertical(BYTE *buffer)
-{
-    unsigned int bytesPerLine = frameBytes / frameHeight;
-	BYTE  * templine = new BYTE[bytesPerLine];
-    BYTE *s = buffer;
-    BYTE *d = buffer + frameBytes - bytesPerLine;
-    unsigned int i;
 
-    for (i=0; i<frameHeight/2; i++)
-    {
-	memcpy(&templine, s, bytesPerLine);
-	memcpy(s, d, bytesPerLine);
-	memcpy(d, &templine, bytesPerLine);
-	s += bytesPerLine;
-	d -= bytesPerLine;
-    }
-    delete templine;
-}
-
 /*
  *
  *
@@ -576,8 +553,6 @@
 	    return PFalse;
 	}
 
-	if (flipVertical)
-	    FlipVertical((BYTE *)tempFrame);
 	converter->Convert((BYTE *)tempFrame, destFrame, cbBuffer, bytesReturned);
     }
     else
@@ -589,9 +564,6 @@
 	    return PFalse;
 	}
 
-	if (flipVertical)
-	    FlipVertical(destFrame);
-
 	*bytesReturned = cbBuffer;
 
     }
@@ -793,11 +765,11 @@
 	    pMediaFormat->subtype == MEDIASUBTYPE_RGB565 ||
 	    pMediaFormat->subtype == MEDIASUBTYPE_RGB555)
 	{
-	    flipVertical = PTrue;
+	    nativeVerticalFlip = true;
 	}
 	else
 	{
-	    flipVertical = PFalse;
+	    nativeVerticalFlip = false;
 	}
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19140] ptlib/trunk

From: <rjongbloed@us...> - 2007-12-20 12:41

Revision: 19140
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19140&view=rev
Author:   rjongbloed
Date:     2007-12-20 04:41:01 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
Added GarbageCollection hook to PSafeObject so when they are being deleted from their owner collection, they get an opportunity to clean up any objects they in turn own, before the real destructor is called. This gets around issues were the owned objects have references to the owner and the owner cannot be deleted until all the owned are deleted.

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/safecoll.h
    ptlib/trunk/src/ptlib/common/safecoll.cxx

Modified: ptlib/trunk/include/ptlib/safecoll.h
===================================================================
--- ptlib/trunk/include/ptlib/safecoll.h	2007-12-20 12:29:53 UTC (rev 19139)
+++ ptlib/trunk/include/ptlib/safecoll.h	2007-12-20 12:41:01 UTC (rev 19140)
@@ -222,6 +222,19 @@
        to be used directly by an application.
       */
     PBoolean SafelyCanBeDeleted() const;
+
+    /**Do any garbage collection that may be required by the object so that it
+       may be finally deleted. This is especially useful if there a references
+       back to this object which this object is in charge of disposing of. This
+       reference "glare" is to be resolved by this function being called every
+       time the owner collection is cleaning up, causing a cascade of clean ups
+       that might need to be required.
+
+       Default implementation simply returns true.
+
+       @return true if object may be deleted.
+      */
+    virtual bool GarbageCollection();
   //@}
 
   private:

Modified: ptlib/trunk/src/ptlib/common/safecoll.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/safecoll.cxx	2007-12-20 12:29:53 UTC (rev 19139)
+++ ptlib/trunk/src/ptlib/common/safecoll.cxx	2007-12-20 12:41:01 UTC (rev 19140)
@@ -147,6 +147,12 @@
 }
 
 
+bool PSafeObject::GarbageCollection()
+{
+  return true;
+}
+
+
 /////////////////////////////////////////////////////////////////////////////
 
 PSafeLockReadOnly::PSafeLockReadOnly(const PSafeObject & object)
@@ -303,7 +309,7 @@
 
   PINDEX i = 0;
   while (i < toBeRemoved.GetSize()) {
-    if (toBeRemoved[i].SafelyCanBeDeleted()) {
+    if (toBeRemoved[i].GarbageCollection() && toBeRemoved[i].SafelyCanBeDeleted()) {
       PObject * obj = toBeRemoved.RemoveAt(i);
       removalMutex.Signal();
       DeleteObject(obj);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19190] ptlib/trunk

From: <rjongbloed@us...> - 2008-01-03 14:53

Revision: 19190
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19190&view=rev
Author:   rjongbloed
Date:     2008-01-03 06:53:11 -0800 (Thu, 03 Jan 2008)

Log Message:
-----------
Added ability to read XML object from an istream.

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/pxml.h
    ptlib/trunk/src/ptclib/pxml.cxx

Modified: ptlib/trunk/include/ptclib/pxml.h
===================================================================
--- ptlib/trunk/include/ptclib/pxml.h	2008-01-03 12:30:13 UTC (rev 19189)
+++ ptlib/trunk/include/ptclib/pxml.h	2008-01-03 14:53:11 UTC (rev 19190)
@@ -90,6 +90,7 @@
     int options;
     void * expat;
     PXMLElement * rootElement;
+    bool rootOpen;
     PXMLElement * currentElement;
     PXMLData * lastElement;
     PString version, encoding;
@@ -144,6 +145,7 @@
 
     ~PXML();
 
+    bool IsLoaded() const { return rootElement != NULL; }
     PBoolean IsDirty() const;
 
     PBoolean Load(const PString & data, int options = -1);
@@ -174,6 +176,7 @@
     ) const;
 
     void PrintOn(ostream & strm) const;
+    void ReadFrom(istream & strm);
 
     PXMLElement * GetElement(const PCaselessString & name, PINDEX idx = 0) const;
     PXMLElement * GetElement(PINDEX idx) const;
@@ -385,7 +388,6 @@
     virtual PXML * Read(PChannel * channel);
 
   protected:
-    PBoolean rootOpen;
     PQueue<PXML> messages;
 };
 

Modified: ptlib/trunk/src/ptclib/pxml.cxx
===================================================================
--- ptlib/trunk/src/ptclib/pxml.cxx	2008-01-03 12:30:13 UTC (rev 19189)
+++ ptlib/trunk/src/ptclib/pxml.cxx	2008-01-03 14:53:11 UTC (rev 19190)
@@ -110,6 +110,7 @@
 
 PXMLParser::PXMLParser(int _options)
   : options(_options)
+  , rootOpen(true)
 {
   if (options < 0)
     options = 0;
@@ -139,13 +140,14 @@
 
 PXMLElement * PXMLParser::GetXMLTree() const
 { 
-  return rootElement; 
+  return rootOpen ? NULL : rootElement; 
 }
 
 PXMLElement * PXMLParser::SetXMLTree(PXMLElement * newRoot)
 { 
   PXMLElement * oldRoot = rootElement;
-  rootElement = newRoot; 
+  rootElement = newRoot;
+  rootOpen = false;
   return oldRoot;
 }
 
@@ -176,13 +178,20 @@
   currentElement = newElement;
   lastElement    = NULL;
 
-  if (rootElement == NULL)
+  if (rootElement == NULL) {
     rootElement = currentElement;
+    rootOpen = true;
+  }
 }
 
 void PXMLParser::EndElement(const char * /*name*/)
 {
-  currentElement = currentElement->GetParent();
+  if (currentElement != rootElement)
+    currentElement = currentElement->GetParent();
+  else {
+    currentElement = NULL;
+    rootOpen = false;
+  }
   lastElement    = NULL;
 }
 
@@ -655,6 +664,41 @@
   }
 }
 
+
+void PXML::ReadFrom(istream & strm)
+{
+  rootMutex.Wait();
+  delete rootElement;
+  rootElement = NULL;
+  rootMutex.Signal();
+
+  PXMLParser parser(options);
+  while (strm.good()) {
+    PString line;
+    strm >> line;
+
+    if (!parser.Parse(line, line.GetLength(), false)) {
+      parser.GetErrorInfo(errorString, errorCol, errorLine);
+      break;
+    }
+
+    if (parser.GetXMLTree() != NULL) {
+      rootMutex.Wait();
+
+      version    = parser.GetVersion();
+      encoding   = parser.GetEncoding();
+      standAlone = parser.GetStandAlone();
+      rootElement = parser.GetXMLTree();
+
+      rootMutex.Signal();
+
+      PTRACE(4, "XML\tRead XML " << rootElement->GetName());
+      break;
+    }
+  }
+}
+
+
 PString PXML::CreateStartTag(const PString & text)
 {
   return '<' + text + '>';
@@ -1044,8 +1088,7 @@
 
 ///////////////////////////////////////////////////////
 
-PXMLStreamParser::PXMLStreamParser() :
-  rootOpen(PTrue)
+PXMLStreamParser::PXMLStreamParser()
 {
 }
 
@@ -1056,23 +1099,18 @@
 
   PXMLParser::EndElement(name);
 
-  if (currentElement == rootElement) {
-      if (element == rootElement) { // stream closed
-        rootOpen = PFalse;
-      }
-      else {
-        PINDEX i = rootElement->FindObject(element);
+  if (rootOpen) {
+    PINDEX i = rootElement->FindObject(element);
 
-        if (i != P_MAX_INDEX) {
-          PXML tmp;
-          element = (PXMLElement *)element->Clone(0);
-          rootElement->RemoveElement(i);
+    if (i != P_MAX_INDEX) {
+      PXML tmp;
+      element = (PXMLElement *)element->Clone(0);
+      rootElement->RemoveElement(i);
 
-          PXML * msg = new PXML;
-          msg->SetRootElement(element);
-          messages.Enqueue(msg);
-        }
-     }
+      PXML * msg = new PXML;
+      msg->SetRootElement(element);
+      messages.Enqueue(msg);
+    }
   }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19193] ptlib/trunk

From: <rjongbloed@us...> - 2008-01-04 15:27

Revision: 19193
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19193&view=rev
Author:   rjongbloed
Date:     2008-01-04 07:28:01 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
Added PTLIB_CONFIGURE_OPTIONS environment variable to speed usage of Windows configure when packages are in "standard" directories.

Modified Paths:
--------------
    ptlib/trunk/ReadMe.txt
    ptlib/trunk/src/ptlib/msos/Console_2005.vcproj

Modified: ptlib/trunk/ReadMe.txt
===================================================================
--- ptlib/trunk/ReadMe.txt	2008-01-04 06:04:22 UTC (rev 19192)
+++ ptlib/trunk/ReadMe.txt	2008-01-04 15:28:01 UTC (rev 19193)
@@ -152,6 +152,16 @@
     line. Use ".\configure --help" to get information on options such as
     forcing a feature or library dependency.
 
+    The above will search the entire hard disk(s) for software packages to
+    configure. This may take some time, so a useful feature is to set the
+    environment variable:
+
+	PTLIB_CONFIGURE_OPTIONS = --no-search
+
+    which will only search some "standard" locations. Not ethat you could
+    also include arguments to set the paths of packages that are not in
+    standard locations.
+
     Note there are additional notes in the "Platform Specific Issues" on how
     to compile the various libraries in a manner suitable for use by PTLib
     under Windows.

Modified: ptlib/trunk/src/ptlib/msos/Console_2005.vcproj
===================================================================
--- ptlib/trunk/src/ptlib/msos/Console_2005.vcproj	2008-01-04 06:04:22 UTC (rev 19192)
+++ ptlib/trunk/src/ptlib/msos/Console_2005.vcproj	2008-01-04 15:28:01 UTC (rev 19193)
@@ -174,13 +174,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-			OutputDirectory="..\..\..\lib\wm6"
+			Name="Release|Win32"
+			OutputDirectory="..\..\..\Lib"
 			IntermediateDirectory="$(OutDir)\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -196,24 +195,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\include"
-				PreprocessorDefinitions="_DEBUG;DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=1"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
+				PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="ptlib.h"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)/"
+				PrecompiledHeaderFile="$(IntDir)\Console.pch"
 				ProgramDataBaseFileName="$(OutDir)\$(TargetName).pdb"
-				BrowseInformation="1"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -231,7 +227,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\ptlibsd.lib"
+				OutputFile="$(OutDir)\ptlibs.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -244,23 +240,15 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\..\Lib"
+			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="..\..\..\lib\wm5"
 			IntermediateDirectory="$(OutDir)\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="0"
@@ -280,20 +268,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\include"
-				PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=1"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=1"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="ptlib.h"
-				PrecompiledHeaderFile="$(IntDir)\Console.pch"
 				ProgramDataBaseFileName="$(OutDir)\$(TargetName).pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -325,15 +316,23 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCFxCopTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="..\..\..\lib\wm5"
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\..\Lib"
 			IntermediateDirectory="$(OutDir)\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="0"
@@ -353,23 +352,20 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\include"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=1"
+				PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="ptlib.h"
+				PrecompiledHeaderFile="$(IntDir)\Console.pch"
 				ProgramDataBaseFileName="$(OutDir)\$(TargetName).pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -388,7 +384,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\ptlibs.lib"
+				OutputFile="$(OutDir)\ptlibsn.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -401,28 +397,19 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-			OutputDirectory="..\..\..\lib\wm6"
+			Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="..\..\..\lib\wm5"
 			IntermediateDirectory="$(OutDir)\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -446,7 +433,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\include"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -455,8 +442,6 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="ptlib.h"
-				AssemblerListingLocation=""
-				ObjectFile="$(IntDir)/"
 				ProgramDataBaseFileName="$(OutDir)\$(TargetName).pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -475,7 +460,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\ptlibs.lib"
+				OutputFile="$(OutDir)\ptlibsn.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -503,12 +488,13 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="No Trace|Win32"
-			OutputDirectory="..\..\..\Lib"
+			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+			OutputDirectory="..\..\..\lib\wm6"
 			IntermediateDirectory="$(OutDir)\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -524,21 +510,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
+				ExecutionBucket="7"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\include"
-				PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=0"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_DEBUG;DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=1"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="ptlib.h"
-				PrecompiledHeaderFile="$(IntDir)\Console.pch"
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
 				ProgramDataBaseFileName="$(OutDir)\$(TargetName).pdb"
+				BrowseInformation="1"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -556,7 +545,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\ptlibsn.lib"
+				OutputFile="$(OutDir)\ptlibsd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -569,19 +558,28 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCFxCopTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
 		</Configuration>
 		<Configuration
-			Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="..\..\..\lib\wm5"
+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+			OutputDirectory="..\..\..\lib\wm6"
 			IntermediateDirectory="$(OutDir)\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -605,7 +603,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\include"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=0"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -614,6 +612,8 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="ptlib.h"
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
 				ProgramDataBaseFileName="$(OutDir)\$(TargetName).pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
@@ -632,7 +632,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\ptlibsn.lib"
+				OutputFile="$(OutDir)\ptlibs.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -786,20 +786,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="1"
-							BrowseInformation="1"
-							ShowIncludes="false"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -810,7 +808,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -821,7 +819,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -832,18 +830,20 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="1"
+							BrowseInformation="1"
+							ShowIncludes="false"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -891,18 +891,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -912,7 +911,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -922,7 +921,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -932,17 +931,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -988,18 +988,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1009,7 +1008,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1019,7 +1018,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1029,17 +1028,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1085,18 +1085,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1106,7 +1105,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1116,7 +1115,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1126,17 +1125,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1178,7 +1178,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1187,7 +1187,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1196,7 +1196,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1205,7 +1205,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1214,7 +1214,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1223,7 +1223,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1269,43 +1269,43 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
-							AdditionalIncludeDirectories="..\..\..\include\ptlib\wm"
+							Optimization="2"
+							InlineFunctionExpansion="0"
+							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							Optimization="2"
 							InlineFunctionExpansion="0"
-							AdditionalIncludeDirectories=""
+							AdditionalIncludeDirectories="..\..\..\include\ptlib\wm"
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							Optimization="2"
 							InlineFunctionExpansion="0"
-							AdditionalIncludeDirectories="..\..\..\include\ptlib\wm"
+							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1317,19 +1317,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
-							InlineFunctionExpansion="0"
-							AdditionalIncludeDirectories=""
+							Optimization="0"
+							AdditionalIncludeDirectories="..\..\..\include\ptlib\wm"
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1380,19 +1380,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1402,8 +1401,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1413,7 +1411,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -1424,17 +1422,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -1483,19 +1483,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1505,8 +1504,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1516,7 +1514,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -1527,17 +1525,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -1589,18 +1589,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1610,7 +1609,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1620,7 +1619,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1630,17 +1629,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1686,18 +1686,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1707,7 +1706,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1717,7 +1716,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1727,17 +1726,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1783,18 +1783,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1804,7 +1803,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1814,7 +1813,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1824,17 +1823,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1880,18 +1880,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1901,7 +1900,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1911,7 +1910,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1921,17 +1920,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1977,18 +1977,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1998,7 +1997,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2008,7 +2007,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2018,17 +2017,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2074,18 +2074,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2095,7 +2094,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2105,7 +2104,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2115,17 +2114,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2171,18 +2171,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2192,7 +2191,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2202,7 +2201,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2212,17 +2211,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2268,18 +2268,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2289,7 +2288,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2299,7 +2298,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2309,17 +2308,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2365,18 +2365,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2386,7 +2385,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2396,7 +2395,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2406,17 +2405,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2462,18 +2462,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2483,7 +2482,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2493,7 +2492,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2503,17 +2502,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2559,18 +2559,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2580,7 +2579,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2590,7 +2589,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2600,17 +2599,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2656,18 +2656,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2677,7 +2676,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2687,7 +2686,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2697,17 +2696,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2754,19 +2754,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2776,8 +2775,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2787,7 +2785,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -2798,17 +2796,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -2856,18 +2856,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2877,7 +2876,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2887,7 +2886,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2897,17 +2896,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2954,19 +2954,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2976,8 +2975,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -2987,7 +2985,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -2998,17 +2996,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -3056,18 +3056,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3077,7 +3076,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3087,7 +3086,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3097,17 +3096,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3153,18 +3153,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3174,7 +3173,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3184,7 +3183,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3194,17 +3193,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3250,18 +3250,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3271,7 +3270,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3281,7 +3280,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3291,17 +3290,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3353,19 +3353,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3376,7 +3375,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3387,7 +3386,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3398,18 +3397,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3458,19 +3458,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3480,8 +3479,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3491,7 +3489,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -3502,17 +3500,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -3560,18 +3560,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3581,7 +3580,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3591,7 +3590,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3601,17 +3600,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3659,19 +3659,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3682,7 +3681,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3693,7 +3692,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3704,18 +3703,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3765,19 +3765,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3788,7 +3787,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3799,7 +3798,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3810,18 +3809,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
 							UsePrecompiledHeader="0"
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3869,18 +3869,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3890,7 +3889,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3900,7 +3899,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3910,17 +3909,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3974,18 +3974,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3995,7 +3994,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4005,7 +4004,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4015,17 +4014,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4071,18 +4071,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4092,7 +4091,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4102,7 +4101,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4112,17 +4111,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4169,19 +4169,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4191,8 +4190,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-						ExcludedFromBuild="true"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4202,7 +4200,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4213,17 +4211,19 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4271,18 +4271,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="0"
+							Optimization="2"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
-							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4292,7 +4291,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4302,7 +4301,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4312,17 +4311,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							Optimization="2"
+							Optimization="0"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							BrowseInformation="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4366,7 +4366,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4374,7 +4374,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4382,7 +4382,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4390,7 +4390,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4398,7 +4398,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4406,7 +4406,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4446,7 +4446,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4454,7 +4454,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4462,7 +4462,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4470,7 +4470,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4478,7 +4478,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4486,7 +4486,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4522,7 +4522,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4530,7 +4530,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4538,7 +4538,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4546,7 +4546,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4554,7 +4554,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4562,7 +4562,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4642,7 +4642,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4650,7 +4650,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4658,7 +4658,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4666,7 +4666,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4710,7 +4710,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4718,7 +4718,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4726,7 +4726,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4734,7 +4734,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4782,7 +4782,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4790,7 +4790,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4798,7 +4798,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4806,7 +4806,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -4866,7 +4866,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4874,7 +4874,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4882,7 +4882,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="No Trace|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4890,7 +4890,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4898,7 +4898,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Win32"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4906,7 +4906,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -5156,7 +5156,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5164,7 +5164,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5172,7 +5172,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="No Trace|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5180,7 +5180,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5188,7 +5188,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Win32"
+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5196,7 +5196,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5221,7 +5221,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Configuring Build Options"
-						CommandLine="cd $(ProjectDir)\..\..\..&#x0D;&#x0A;configure --exclude-env=VSNET2005_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%&#x0D;&#x0A;"
+						CommandLine="cd $(ProjectDir)\..\..\..&#x0D;&#x0A;configure --exclude-env=VSNET2005_PWLIB_CONFIGURE_EXCLUDE_DIRS %PTLIB_CONFIGURE_OPTIONS% %PWLIB_CONFIGURE_OPTIONS%&#x0D;&#x0A;"
 						AdditionalDependencies="$(SolutionDir)/configure.ac"
 						Outputs="$(InputDir)ptbuildopts.h"
 					/>
@@ -5238,18 +5238,18 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Configuring Build Options"
-						CommandLine="cd $(ProjectDir)\..\..\..&#x0D;&#x0A;configure --exclude-env=VSNET2005_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%&#x0D;&#x0A;"
+						CommandLine="cd $(ProjectDir)\..\..\..&#x0D;&#x0A;configure --exclude-env=VSNET2005_PWLIB_CONFIGURE_EXCLUDE_DIRS %PTLIB_CONFIGURE_OPTIONS% %PWLIB_CONFIGURE_OPTIONS%&#x0D;&#x0A;"
 						AdditionalDependencies="$(SolutionDir)/configure.ac"
 						Outputs="$(InputDir)ptbuildopts.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5260,18 +5260,18 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="No Trace|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Configuring Build Options"
-						CommandLine="cd $(ProjectDir)\..\..\..&#x0D;&#x0A;configure --exclude-env=VSNET2005_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%&#x0D;&#x0A;"
+						CommandLine="cd $(ProjectDir)\..\..\..&#x0D;&#x0A;configure --exclude-env=VSNET2005_PWLIB_CONFIGURE_EXCLUDE_DIRS %PTLIB_CONFIGURE_OPTIONS% %PWLIB_CONFIGURE_OPTIONS%&#x0D;&#x0A;"
 						AdditionalDependencies="$(SolutionDir)/configure.ac"
 						Outputs="$(InputDir)ptbuildopts.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5282,7 +5282,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Win32"
+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5293,7 +5293,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -6370,44 +6370,43 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
+						Optimization="2"
+						AdditionalIncludeDirectories="..\common\regex"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
-						BrowseInformation="1"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
+						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="No Trace|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
+						AdditionalIncludeDirectories="..\common\regex"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6419,19 +6418,20 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Win32"
+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
+						Optimization="0"
+						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
+						BrowseInformation="1"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6485,44 +6485,43 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
+						Optimization="2"
+						AdditionalIncludeDirectories="..\common\regex"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
-						BrowseInformation="1"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
+						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="No Trace|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
+						AdditionalIncludeDirectories="..\common\regex"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6534,19 +6533,20 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Win32"
+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
+						Optimization="0"
+						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
+						BrowseInformation="1"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6600,44 +6600,43 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
+						Optimization="2"
+						AdditionalIncludeDirectories="..\common\regex"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
-						BrowseInformation="1"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
+						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="No Trace|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
+						AdditionalIncludeDirectories="..\common\regex"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6649,19 +6648,20 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Win32"
+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
+						Optimization="0"
+						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
+						BrowseInformation="1"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6715,44 +6715,43 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
+						Optimization="2"
+						AdditionalIncludeDirectories="..\common\regex"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
-						BrowseInformation="1"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
+						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="No Trace|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
+						AdditionalIncludeDirectories="..\common\regex"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -6764,19 +6763,20 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Win32"
+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories="..\common\regex"
+						Optimization="0"
+						AdditionalIncludeDirectories="..\common\regex;..\..\..\include\ptlib\wm"
 						PreprocessorDefinitions=""
 						UsePrecompiledHeader="0"
+						BrowseInformation="1"
 						WarningLevel="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19196] ptlib/trunk

From: <rjongbloed@us...> - 2008-01-04 16:56

Revision: 19196
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19196&view=rev
Author:   rjongbloed
Date:     2008-01-04 08:56:44 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
Added DevStudio 2008 project/solution files.

Added Paths:
-----------
    ptlib/trunk/ptlib_samples_2008.sln
    ptlib/trunk/samples/ThreadSafe/ThreadSafe_2008.vcproj
    ptlib/trunk/samples/aggtest/aggtest_2008.vcproj
    ptlib/trunk/samples/dnstest/dnstest_2008.vcproj
    ptlib/trunk/samples/dtmftest/dtmftest_2008.vcproj
    ptlib/trunk/samples/emailtest/emailtest_2008.vcproj
    ptlib/trunk/samples/factory/factory_2008.vcproj
    ptlib/trunk/samples/find_ip/find_ip_2008.vcproj
    ptlib/trunk/samples/hello_world/helloDLL_2008.vcproj
    ptlib/trunk/samples/hello_world/hello_2008.vcproj
    ptlib/trunk/samples/ipv6test/ipv6test_2008.vcproj
    ptlib/trunk/samples/ldaptest/ldaptest_2008.vcproj
    ptlib/trunk/samples/ptimer/ptimer_2008.vcproj
    ptlib/trunk/samples/pxml/PxmlTest_2008.vcproj
    ptlib/trunk/samples/safetest/safetest_2008.vcproj
    ptlib/trunk/samples/sockbundle/sockbundle_2008.vcproj
    ptlib/trunk/samples/sortedlist/SortedListTest_2008.vcproj
    ptlib/trunk/samples/stunclient/stunclient_2008.vcproj
    ptlib/trunk/samples/threadex/threadex_2008.vcproj
    ptlib/trunk/samples/timing/timing_2008.vcproj
    ptlib/trunk/samples/vidtest/vidtest_2008.vcproj
    ptlib/trunk/samples/vxmltest/vxmltest_2008.vcproj
    ptlib/trunk/samples/wavfile/wavfile_2008.vcproj
    ptlib/trunk/samples/xmlrpc/xmlrpc_2008.vcproj
    ptlib/trunk/samples/xmlrpcsrvr/xmlrpcsrvr_2008.vcproj
    ptlib/trunk/samples/xmpptest/xmpptest_2008.vcproj
    ptlib/trunk/src/ptclib/speex_echo/PAEC_2008.vcproj
    ptlib/trunk/src/ptlib/msos/Console_2008.vcproj
    ptlib/trunk/src/ptlib/msos/PTLib_2008.vcproj
    ptlib/trunk/tools/MergeSym/MergeSym_2008.vcproj
    ptlib/trunk/tools/configure/configure_2008.vcproj

Added: ptlib/trunk/ptlib_samples_2008.sln
===================================================================
--- ptlib/trunk/ptlib_samples_2008.sln	                        (rev 0)
+++ ptlib/trunk/ptlib_samples_2008.sln	2008-01-04 16:56:44 UTC (rev 19196)
@@ -0,0 +1,253 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World Static", "samples\hello_world\hello_2008.vcproj", "{D38CA533-D522-4D9E-B2C9-D59F6C415268}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib Static", "src\ptlib\msos\Console_2008.vcproj", "{D11E1C9D-406C-4D7C-8F37-913C0BFD9E0D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib DLL", "src\ptlib\msos\PTLib_2008.vcproj", "{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeSym", "tools\MergeSym\MergeSym_2008.vcproj", "{F34BE504-015A-42E6-9342-3800EAD5F561}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paec", "src\ptclib\speex_echo\PAEC_2008.vcproj", "{6316EB4E-0F57-4491-9383-22072AF3D996}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aggtest", "samples\aggtest\aggtest_2008.vcproj", "{0BF651AA-894B-49F3-9B60-24BFFBFC004C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "tools\configure\configure_2008.vcproj", "{9C8D0100-6709-4628-9993-69F443AF69E8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnstest", "samples\dnstest\dnstest_2008.vcproj", "{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtmftest", "samples\dtmftest\dtmftest_2008.vcproj", "{F057363D-AFD2-4DC4-9C44-57B714C27162}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emailtest", "samples\emailtest\emailtest_2008.vcproj", "{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "factory", "samples\factory\factory_2008.vcproj", "{2C44F783-CA2A-44A5-A463-CC7956BE00A7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "find_ip", "samples\find_ip\find_ip_2008.vcproj", "{46D2EA84-33A6-4249-B9ED-779065478CA6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipv6test", "samples\ipv6test\ipv6test_2008.vcproj", "{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ldaptest", "samples\ldaptest\ldaptest_2008.vcproj", "{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptimer", "samples\ptimer\ptimer_2008.vcproj", "{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PxmlTest", "samples\pxml\PxmlTest_2008.vcproj", "{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "safetest", "samples\safetest\safetest_2008.vcproj", "{DC097EDA-0EF2-4EEC-B3D9-B9A3726C922F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SortedListTest", "samples\sortedlist\SortedListTest_2008.vcproj", "{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stunclient", "samples\stunclient\stunclient_2008.vcproj", "{D0C00ADD-544B-4922-AB52-14415894D684}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThreadSafe", "samples\ThreadSafe\ThreadSafe_2008.vcproj", "{7AB210A3-FB94-473A-93A5-7CEE149B136C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timing", "samples\timing\timing_2008.vcproj", "{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vidtest", "samples\vidtest\vidtest_2008.vcproj", "{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vxmltest", "samples\vxmltest\vxmltest_2008.vcproj", "{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wavfile", "samples\wavfile\wavfile_2008.vcproj", "{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D11E1C9D-406C-4D7C-8F37-913C0BFD9E0D} = {D11E1C9D-406C-4D7C-8F37-913C0BFD9E0D}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "samples\xmlrpc\xmlrpc_2008.vcproj", "{435616F1-7BA5-4DF5-9108-879BE511F5A1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpptest", "samples\xmpptest\xmpptest_2008.vcproj", "{D2A0F886-B231-4CD6-A959-3FB1626C1662}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadex", "samples\threadex\threadex_2008.vcproj", "{89F7154A-47E5-47FE-88E3-E5E8EC516752}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpcsrvr", "samples\xmlrpcsrvr\xmlrpcsrvr_2008.vcproj", "{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World DLL", "samples\hello_world\helloDLL_2008.vcproj", "{86680AA2-ACF3-4247-AF25-8E3D80855868}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockbundle", "samples\sockbundle\sockbundle_2008.vcproj", "{EC59B5D7-67B6-4401-B00D-B1FA9DB3C406}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		No Trace|Win32 = No Trace|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug|Win32.Build.0 = Debug|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace|Win32.Build.0 = No Trace|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release|Win32.ActiveCfg = Release|Win32
+		{D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release|Win32.Build.0 = Release|Win32
+		{D11E1C9D-406C-4D7C-8F37-913C0BFD9E0D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D11E1C9D-406C-4D7C-8F37-913C0BFD9E0D}.Debug|Win32.Build.0 = Debug|Win32
+		{D11E1C9D-406C-4D7C-8F37-913C0BFD9E0D}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{D11E1C9D-406C-4D7C-8F37-913C0BFD9E0D}.No Trace|Win32.Build.0 = No Trace|Win32
+		{D11E1C9D-406C-4D7C-8F37-913C0BFD9E0D}.Release|Win32.ActiveCfg = Release|Win32
+		{D11E1C9D-406C-4D7C-8F37-913C0BFD9E0D}.Release|Win32.Build.0 = Release|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug|Win32.Build.0 = Debug|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace|Win32.Build.0 = No Trace|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release|Win32.ActiveCfg = Release|Win32
+		{85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release|Win32.Build.0 = Release|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.No Trace|Win32.Build.0 = No Trace|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release|Win32.ActiveCfg = Release|Win32
+		{F34BE504-015A-42E6-9342-3800EAD5F561}.Release|Win32.Build.0 = Release|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Debug|Win32.Build.0 = Debug|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace|Win32.Build.0 = No Trace|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release|Win32.ActiveCfg = Release|Win32
+		{6316EB4E-0F57-4491-9383-22072AF3D996}.Release|Win32.Build.0 = Release|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug|Win32.Build.0 = Debug|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace|Win32.Build.0 = No Trace|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release|Win32.ActiveCfg = Release|Win32
+		{0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release|Win32.Build.0 = Release|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.No Trace|Win32.ActiveCfg = Release|Win32
+		{9C8D0100-6709-4628-9993-69F443AF69E8}.Release|Win32.ActiveCfg = Release|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug|Win32.Build.0 = Debug|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace|Win32.Build.0 = No Trace|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release|Win32.ActiveCfg = Release|Win32
+		{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release|Win32.Build.0 = Release|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug|Win32.Build.0 = Debug|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace|Win32.Build.0 = No Trace|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Release|Win32.ActiveCfg = Release|Win32
+		{F057363D-AFD2-4DC4-9C44-57B714C27162}.Release|Win32.Build.0 = Release|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug|Win32.Build.0 = Debug|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace|Win32.Build.0 = No Trace|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release|Win32.ActiveCfg = Release|Win32
+		{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release|Win32.Build.0 = Release|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug|Win32.Build.0 = Debug|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace|Win32.Build.0 = No Trace|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release|Win32.ActiveCfg = Release|Win32
+		{2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release|Win32.Build.0 = Release|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug|Win32.Build.0 = Debug|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace|Win32.Build.0 = No Trace|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Release|Win32.ActiveCfg = Release|Win32
+		{46D2EA84-33A6-4249-B9ED-779065478CA6}.Release|Win32.Build.0 = Release|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug|Win32.ActiveCfg = Debug|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug|Win32.Build.0 = Debug|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace|Win32.Build.0 = No Trace|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release|Win32.ActiveCfg = Release|Win32
+		{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release|Win32.Build.0 = Release|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug|Win32.Build.0 = Debug|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace|Win32.Build.0 = No Trace|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release|Win32.ActiveCfg = Release|Win32
+		{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release|Win32.Build.0 = Release|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug|Win32.Build.0 = Debug|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace|Win32.Build.0 = No Trace|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release|Win32.ActiveCfg = Release|Win32
+		{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release|Win32.Build.0 = Release|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug|Win32.Build.0 = Debug|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace|Win32.Build.0 = No Trace|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release|Win32.ActiveCfg = Release|Win32
+		{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release|Win32.Build.0 = Release|Win32
+		{DC097EDA-0EF2-4EEC-B3D9-B9A3726C922F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DC097EDA-0EF2-4EEC-B3D9-B9A3726C922F}.Debug|Win32.Build.0 = Debug|Win32
+		{DC097EDA-0EF2-4EEC-B3D9-B9A3726C922F}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{DC097EDA-0EF2-4EEC-B3D9-B9A3726C922F}.No Trace|Win32.Build.0 = No Trace|Win32
+		{DC097EDA-0EF2-4EEC-B3D9-B9A3726C922F}.Release|Win32.ActiveCfg = Release|Win32
+		{DC097EDA-0EF2-4EEC-B3D9-B9A3726C922F}.Release|Win32.Build.0 = Release|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug|Win32.Build.0 = Debug|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace|Win32.Build.0 = No Trace|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release|Win32.ActiveCfg = Release|Win32
+		{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release|Win32.Build.0 = Release|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Debug|Win32.Build.0 = Debug|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.No Trace|Win32.Build.0 = No Trace|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Release|Win32.ActiveCfg = Release|Win32
+		{D0C00ADD-544B-4922-AB52-14415894D684}.Release|Win32.Build.0 = Release|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug|Win32.Build.0 = Debug|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace|Win32.Build.0 = No Trace|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release|Win32.ActiveCfg = Release|Win32
+		{7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release|Win32.Build.0 = Release|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug|Win32.Build.0 = Debug|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace|Win32.Build.0 = No Trace|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release|Win32.ActiveCfg = Release|Win32
+		{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release|Win32.Build.0 = Release|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug|Win32.Build.0 = Debug|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace|Win32.Build.0 = No Trace|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release|Win32.ActiveCfg = Release|Win32
+		{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release|Win32.Build.0 = Release|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug|Win32.Build.0 = Debug|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace|Win32.Build.0 = No Trace|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release|Win32.ActiveCfg = Release|Win32
+		{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release|Win32.Build.0 = Release|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug|Win32.Build.0 = Debug|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace|Win32.Build.0 = No Trace|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release|Win32.ActiveCfg = Release|Win32
+		{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release|Win32.Build.0 = Release|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug|Win32.Build.0 = Debug|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.No Trace|Win32.Build.0 = No Trace|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release|Win32.ActiveCfg = Release|Win32
+		{435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release|Win32.Build.0 = Release|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug|Win32.Build.0 = Debug|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace|Win32.Build.0 = No Trace|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release|Win32.ActiveCfg = Release|Win32
+		{D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release|Win32.Build.0 = Release|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug|Win32.ActiveCfg = Debug|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug|Win32.Build.0 = Debug|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace|Win32.Build.0 = No Trace|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release|Win32.ActiveCfg = Release|Win32
+		{89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release|Win32.Build.0 = Release|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug|Win32.Build.0 = Debug|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace|Win32.Build.0 = No Trace|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release|Win32.ActiveCfg = Release|Win32
+		{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release|Win32.Build.0 = Release|Win32
+		{86680AA2-ACF3-4247-AF25-8E3D80855868}.Debug|Win32.ActiveCfg = Debug|Win32
+		{86680AA2-ACF3-4247-AF25-8E3D80855868}.Debug|Win32.Build.0 = Debug|Win32
+		{86680AA2-ACF3-4247-AF25-8E3D80855868}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{86680AA2-ACF3-4247-AF25-8E3D80855868}.No Trace|Win32.Build.0 = No Trace|Win32
+		{86680AA2-ACF3-4247-AF25-8E3D80855868}.Release|Win32.ActiveCfg = Release|Win32
+		{86680AA2-ACF3-4247-AF25-8E3D80855868}.Release|Win32.Build.0 = Release|Win32
+		{EC59B5D7-67B6-4401-B00D-B1FA9DB3C406}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC59B5D7-67B6-4401-B00D-B1FA9DB3C406}.Debug|Win32.Build.0 = Debug|Win32
+		{EC59B5D7-67B6-4401-B00D-B1FA9DB3C406}.No Trace|Win32.ActiveCfg = No Trace|Win32
+		{EC59B5D7-67B6-4401-B00D-B1FA9DB3C406}.No Trace|Win32.Build.0 = No Trace|Win32
+		{EC59B5D7-67B6-4401-B00D-B1FA9DB3C406}.Release|Win32.ActiveCfg = Release|Win32
+		{EC59B5D7-67B6-4401-B00D-B1FA9DB3C406}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Added: ptlib/trunk/samples/ThreadSafe/ThreadSafe_2008.vcproj
===================================================================
--- ptlib/trunk/samples/ThreadSafe/ThreadSafe_2008.vcproj	                        (rev 0)
+++ ptlib/trunk/samples/ThreadSafe/ThreadSafe_2008.vcproj	2008-01-04 16:56:44 UTC (rev 19196)
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="ThreadSafe"
+	ProjectGUID="{7AB210A3-FB94-473A-93A5-7CEE149B136C}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/ThreadSafe.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/ThreadSafe.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PTRACING=1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/ThreadSafe.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=0"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="main.cxx"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="precompile.cxx"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="main.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: ptlib/trunk/samples/aggtest/aggtest_2008.vcproj
===================================================================
--- ptlib/trunk/samples/aggtest/aggtest_2008.vcproj	                        (rev 0)
+++ ptlib/trunk/samples/aggtest/aggtest_2008.vcproj	2008-01-04 16:56:44 UTC (rev 19196)
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="aggtest"
+	ProjectGUID="{0BF651AA-894B-49F3-9B60-24BFFBFC004C}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PTRACING=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=1"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=0"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\main.cxx"
+				>
+			</File>
+			<File
+				RelativePath=".\precompile.cxx"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\main.h"
+				>
+			</File>
+			<File
+				RelativePath=".\precompile.h"
+				>
+			</File>
+			<File
+				RelativePath=".\version.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: ptlib/trunk/samples/dnstest/dnstest_2008.vcproj
===================================================================
--- ptlib/trunk/samples/dnstest/dnstest_2008.vcproj	                        (rev 0)
+++ ptlib/trunk/samples/dnstest/dnstest_2008.vcproj	2008-01-04 16:56:44 UTC (rev 19196)
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="dnstest"
+	ProjectGUID="{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PTRACING=1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=0"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="main.cxx"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="precompile.cxx"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="main.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: ptlib/trunk/samples/dtmftest/dtmftest_2008.vcproj
===================================================================
--- ptlib/trunk/samples/dtmftest/dtmftest_2008.vcproj	                        (rev 0)
+++ ptlib/trunk/samples/dtmftest/dtmftest_2008.vcproj	2008-01-04 16:56:44 UTC (rev 19196)
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="dtmftest"
+	ProjectGUID="{F057363D-AFD2-4DC4-9C44-57B714C27162}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dtmftest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompile.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="$(OutDir)/dtmftest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PTRACING=1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompile.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dtmftest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=0"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompile.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="main.cxx"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="precompile.cxx"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="main.h"
+				>
+			</File>
+			<File
+				RelativePath="precompile.h"
+				>
+			</File>
+			<File
+				RelativePath="version.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: ptlib/trunk/samples/emailtest/emailtest_2008.vcproj
===================================================================
--- ptlib/trunk/samples/emailtest/emailtest_2008.vcproj	                        (rev 0)
+++ ptlib/trunk/samples/emailtest/emailtest_2008.vcproj	2008-01-04 16:56:44 UTC (rev 19196)
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="emailtest"
+	ProjectGUID="{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/emailtest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompile.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/emailtest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PTRACING=1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompile.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/emailtest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=0"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompile.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="main.cxx"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="precompile.cxx"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="main.h"
+				>
+			</File>
+			<File
+				RelativePath="precompile.h"
+				>
+			</File>
+			<File
+				RelativePath="version.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: ptlib/trunk/samples/factory/factory_2008.vcproj
===================================================================
--- ptlib/trunk/samples/factory/factory_2008.vcproj	                        (rev 0)
+++ ptlib/trunk/samples/factory/factory_2008.vcproj	2008-01-04 16:56:44 UTC (rev 19196)
@@ -0,0 +1,440 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="factory"
+	ProjectGUID="{2C44F783-CA2A-44A5-A463-CC7956BE00A7}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/factory.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PTRACING=1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="abstract.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/factory.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="abstract.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/factory.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=0"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="abstract.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="concrete.cxx"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="main.cxx"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="precompile.cxx"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="solid.cxx"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="No Trace|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath=".\abstract.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: ptlib/trunk/samples/find_ip/find_ip_2008.vcproj
===================================================================
--- ptlib/trunk/samples/find_ip/find_ip_2008.vcproj	                        (rev 0)
+++ ptlib/trunk/samples/find_ip/find_ip_2008.vcproj	2008-01-04 16:56:44 UTC (rev 19196)
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="find_ip"
+	ProjectGUID="{46D2EA84-33A6-4249-B9ED-779065478CA6}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/find_ip.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PTRACING=1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				StripPrivateSymbols=""
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/find_ip.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				StripPrivateSymbols=""
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/find_ip.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=0"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="ptlib.h"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				StripPrivateSymbols=""
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+		/>
+	</References>
+	<Files>
+		<File
+			RelativePath="find_ip.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					PreprocessorDefinitions=""
+					BasicRuntimeChecks="3"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="No Trace|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="precompile.cxx"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					PreprocessorDefinitions=""
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					PreprocessorDefinitions=""
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="No Trace|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					PreprocessorDefinitions=""
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: ptlib/trunk/samples/hello_world/helloDLL_2008.vcproj
===================================================================
--- ptlib/trunk/samples/hello_world/helloDLL_2008.vcproj	                        (rev 0)
+++ ptlib/trunk/samples/hello_world/helloDLL_2008.vcproj	2008-01-04 16:56:44 UTC (rev 19196)
@@ -0,0 +1,970 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="Hello World DLL"
+	ProjectGUID="{86680AA2-ACF3-4247-AF25-8E3D80855868}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+		/>
+		<Platform
+			Name="Windows Mobile 6 Professional SDK (ARMV4I)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="ptlib.h"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="ptlib.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;PTRACING=1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="ptlib.h"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="ptlibd.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Win32"
+			OutputDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;PTRACING=0"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="ptlib.h"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="ptlibn.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="..\..\bin\$(ProjectName)\wm5\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\wm5\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="false"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="ptlib.h"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="ptlib.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\wm5"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+			OutputDirectory="..\..\bin\$(ProjectName)\wm6\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=1"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="false"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="ptlib.h"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="ptlib.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\wm6"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="..\..\bin\$(ProjectName)\wm5\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\wm5\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="_DEBUG;DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=1"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="false"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="ptlib.h"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="ptlibd.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\wm5"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+			OutputDirectory="..\..\bin\$(ProjectName)\wm6\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="_DEBUG;DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=1"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="false"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="ptlib.h"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="ptlibd.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\wm6"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="..\..\bin\$(ProjectName)\wm5\$(ConfigurationName)"
+			IntermediateDirectory="..\..\bin\$(ProjectName)\wm5\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=0"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="false"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="ptlib.h"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				ProgramDataBaseFileName="$(OutDir)/$(TargetName).pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG,_AFXDLL"
+				Culture="3081"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="ptlibn.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\wm5"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="9"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="No Trace|Windows Mobile 6 Professional SDK (ARMV4I)"
+			OutputDirectory="..\..\bin\$(ProjectName)\wm6\$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/dnstest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);UNICODE;_UNICODE;XML_STATIC;PTRACING=0"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="false"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="ptlib.h"

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19204] ptlib/trunk

From: <rjongbloed@us...> - 2008-01-06 15:28

Revision: 19204
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19204&view=rev
Author:   rjongbloed
Date:     2008-01-06 07:28:39 -0800 (Sun, 06 Jan 2008)

Log Message:
-----------
Added function to bundled socket channel to get interface last read data was received through.

Cleaned up bool usage.

Modified Paths:
--------------
    ptlib/trunk/include/ptclib/psockbun.h
    ptlib/trunk/src/ptclib/psockbun.cxx

Modified: ptlib/trunk/include/ptclib/psockbun.h
===================================================================
--- ptlib/trunk/include/ptclib/psockbun.h	2008-01-05 12:57:26 UTC (rev 19203)
+++ ptlib/trunk/include/ptclib/psockbun.h	2008-01-06 15:28:39 UTC (rev 19204)
@@ -68,7 +68,7 @@
 
     PInterfaceMonitor(
       unsigned refreshInterval = DefaultRefreshInterval,
-      PBoolean runMonitorThread = PTrue
+      bool runMonitorThread = true
     );
     virtual ~PInterfaceMonitor();
 
@@ -76,7 +76,7 @@
     static PInterfaceMonitor & GetInstance();
 
     /// Start monitoring network interfaces
-    PBoolean Start();
+    bool Start();
 
     /// Stop monitoring network interfaces.
     void Stop();
@@ -88,16 +88,16 @@
         ip%name, eg "10.0.1.11%3Com 3C90x Ethernet Adapter" or "192.168.0.10%eth0"
       */
     PStringArray GetInterfaces(
-      PBoolean includeLoopBack = PFalse,  /// Flag for if loopback is to included in list
+      bool includeLoopBack = false,  /// Flag for if loopback is to included in list
       const PIPSocket::Address & destination = PIPSocket::GetDefaultIpAny()
     );
 
     /** Returns whether destination is reachable through binding or not.
-        The default behaviour returns PTrue unless there is an interface
+        The default behaviour returns true unless there is an interface
         filter installed an the filter does not return 'binding' among
         it's interfaces.
       */
-    PBoolean IsValidBindingForDestination(
+    bool IsValidBindingForDestination(
       const PIPSocket::Address & binding,
       const PIPSocket::Address & destination
     );
@@ -106,7 +106,7 @@
        string. Note that when searchin the descriptor may be a partial match
        e.g. "10.0.1.11" or "%eth0" may be used.
       */
-    PBoolean GetInterfaceInfo(
+    bool GetInterfaceInfo(
       const PString & iface,  /// Interface desciptor name
       InterfaceEntry & info   /// Information on the interface
     );
@@ -115,7 +115,7 @@
         Note that when searching the descriptor may be a partial match
         e.g. "10.0.1.11" or "%eth0" may be used.
       */
-    static PBoolean IsMatchingInterface(
+    static bool IsMatchingInterface(
       const PString & iface,        /// Interface descriptor
       const InterfaceEntry & entry  /// Interface entry
     );
@@ -143,7 +143,7 @@
     ClientList_T              currentClients;
     PIPSocket::InterfaceTable currentInterfaces;
 
-    PBoolean runMonitorThread;
+    bool           runMonitorThread;
     PTimeInterval  refreshInterval;
     PMutex         mutex;
     PThread      * updateThread;
@@ -181,7 +181,7 @@
         before returning it.
       */
     virtual PStringArray GetInterfaces(
-      PBoolean includeLoopBack = PFalse,  /// Flag for if loopback is to included in list
+      bool includeLoopBack = false,  /// Flag for if loopback is to included in list
       const PIPSocket::Address & destination = PIPSocket::GetDefaultIpAny() /// destination
     );
 
@@ -239,7 +239,7 @@
   PCLASSINFO(PMonitoredSockets, PInterfaceMonitorClient);
   protected:
     PMonitoredSockets(
-      PBoolean reuseAddr,
+      bool reuseAddr,
       PSTUNClient * stunClient
     );
 
@@ -248,7 +248,7 @@
         system allocated port is used. In this case and when multiple
         interfaces are supported, all sockets use the same dynamic port value.
 
-        Returns PTrue if all sockets are opened.
+        Returns true if all sockets are opened.
      */
     virtual PBoolean Open(
       WORD port
@@ -315,7 +315,7 @@
       */
     static PMonitoredSockets * Create(
       const PString & iface,            /// Interface name to create socket for
-      PBoolean reuseAddr = PFalse,           /// Re-use or exclusive port number
+      bool reuseAddr = false,           /// Re-use or exclusive port number
       PSTUNClient * stunClient = NULL   /// STUN client code
     );
 
@@ -330,16 +330,16 @@
       bool         inUse;
     };
 
-    PBoolean CreateSocket(
+    bool CreateSocket(
       SocketInfo & info,
       const PIPSocket::Address & binding
     );
-    PBoolean DestroySocket(SocketInfo & info);
-    PBoolean GetSocketAddress(
+    bool DestroySocket(SocketInfo & info);
+    bool GetSocketAddress(
       const SocketInfo & info,
       PIPSocket::Address & address,
       WORD & port,
-      PBoolean usingNAT
+      bool usingNAT
     ) const;
 
     PChannel::Errors WriteToSocket(
@@ -361,7 +361,7 @@
     );
 
     WORD          localPort;
-    PBoolean          reuseAddress;
+    bool          reuseAddress;
     PSTUNClient * stun;
 
     bool          opened;
@@ -385,7 +385,7 @@
     /// Construct a monitored socket bundle channel
     PMonitoredSocketChannel(
       const PMonitoredSocketsPtr & sockets,  /// Monitored socket bundle to use in channel
-      PBoolean shared                            /// Monitored socket is shared by other channels
+      bool shared                            /// Monitored socket is shared by other channels
     );
   //@}
 
@@ -423,10 +423,10 @@
 
     /** Get the local IP address and port for the currently selected interface.
       */
-    PBoolean GetLocal(
+    bool GetLocal(
       PIPSocket::Address & address, /// IP address of local interface
       WORD & port,                  /// Port listening on
-      PBoolean usingNAT                 /// Require NAT address/port
+      bool usingNAT                 /// Require NAT address/port
     );
 
     /// Set the remote address/port for all Write() functions
@@ -447,36 +447,40 @@
     ) const { addr = remoteAddress; port = remotePort; }
 
     /** Set flag for receiving UDP data from any remote address. If the flag
-        is PFalse then data received from anything other than the configured
+        is false then data received from anything other than the configured
         remote address and port is ignored.
       */
     void SetPromiscuous(
-      PBoolean flag   /// New flag
+      bool flag   /// New flag
     ) { promiscuousReads = flag; }
 
     /// Get flag for receiving UDP data from any remote address
     bool GetPromiscuous() { return promiscuousReads; }
 
-    // Get the IP address and port of the last received UDP data.
+    /// Get the IP address and port of the last received UDP data.
     void GetLastReceived(
       PIPSocket::Address & addr,  /// Remote IP address
       WORD & port                 /// Remote port number
     ) const { addr = lastReceivedAddress; port = lastReceivedPort; }
 
+    /// Get the interface the last received UDP data was recieved on.
+    PString GetLastReceivedInterface() const { return lastReceivedInterface; }
+
     /// Get the monitored socket bundle being used by this channel.
     const PMonitoredSocketsPtr & GetMonitoredSockets() const { return socketBundle; }
   //@}
 
   protected:
     PMonitoredSocketsPtr socketBundle;
-    PBoolean                 sharedBundle;
+    bool                 sharedBundle;
     PString              currentInterface;
-    PBoolean                 promiscuousReads;
+    bool                 promiscuousReads;
     PIPSocket::Address   remoteAddress;
-    PBoolean                 closing;
+    bool                 closing;
     WORD                 remotePort;
     PIPSocket::Address   lastReceivedAddress;
     WORD                 lastReceivedPort;
+    PString              lastReceivedInterface;
 };
 
 
@@ -490,7 +494,7 @@
   PCLASSINFO(PMonitoredSocketBundle, PMonitoredSockets);
   public:
     PMonitoredSocketBundle(
-      PBoolean reuseAddr = PFalse,
+      bool reuseAddr = false,
       PSTUNClient * stunClient = NULL
     );
     ~PMonitoredSocketBundle();
@@ -499,7 +503,7 @@
         system allocated port is used. In this case and when multiple
         interfaces are supported, all sockets use the same dynamic port value.
 
-        Returns PTrue if all sockets are opened.
+        Returns true if all sockets are opened.
      */
     virtual PBoolean Open(
       WORD port
@@ -574,7 +578,7 @@
   public:
     PSingleMonitoredSocket(
       const PString & theInterface,
-      PBoolean reuseAddr = PFalse,
+      bool reuseAddr = false,
       PSTUNClient * stunClient = NULL
     );
     ~PSingleMonitoredSocket();
@@ -584,7 +588,7 @@
         ip%name, eg "10.0.1.11%3Com 3C90x Ethernet Adapter" or "192.168.0.10%eth0"
       */
     virtual PStringArray GetInterfaces(
-      PBoolean includeLoopBack = PFalse,  /// Flag for if loopback is to included in list
+      PBoolean includeLoopBack = false,  /// Flag for if loopback is to included in list
       const PIPSocket::Address & destination = PIPSocket::GetDefaultIpAny()
     );
 
@@ -592,7 +596,7 @@
         system allocated port is used. In this case and when multiple
         interfaces are supported, all sockets use the same dynamic port value.
 
-        Returns PTrue if all sockets are opened.
+        Returns true if all sockets are opened.
      */
     virtual PBoolean Open(
       WORD port
@@ -647,7 +651,7 @@
     /// Call back function for when an interface has been removed from the system
     virtual void OnRemoveInterface(const InterfaceEntry & entry);
 
-    PBoolean IsInterface(const PString & iface) const;
+    bool IsInterface(const PString & iface) const;
 
     PString        theInterface;
     InterfaceEntry theEntry;

Modified: ptlib/trunk/src/ptclib/psockbun.cxx
===================================================================
--- ptlib/trunk/src/ptclib/psockbun.cxx	2008-01-05 12:57:26 UTC (rev 19203)
+++ ptlib/trunk/src/ptclib/psockbun.cxx	2008-01-06 15:28:39 UTC (rev 19204)
@@ -57,7 +57,7 @@
 }
 
 
-PStringArray PInterfaceMonitorClient::GetInterfaces(PBoolean includeLoopBack, const PIPSocket::Address & destination)
+PStringArray PInterfaceMonitorClient::GetInterfaces(bool includeLoopBack, const PIPSocket::Address & destination)
 {
   return PInterfaceMonitor::GetInstance().GetInterfaces(includeLoopBack, destination);
 }
@@ -74,7 +74,7 @@
 static PMutex PInterfaceMonitorInstanceMutex;
 static PInterfaceMonitor * PInterfaceMonitorInstance;
 
-PInterfaceMonitor::PInterfaceMonitor(unsigned refresh, PBoolean _runMonitorThread)
+PInterfaceMonitor::PInterfaceMonitor(unsigned refresh, bool _runMonitorThread)
   : runMonitorThread(_runMonitorThread)
   , refreshInterval(refresh)
   , updateThread(NULL)
@@ -107,12 +107,12 @@
 }
 
 
-PBoolean PInterfaceMonitor::Start()
+bool PInterfaceMonitor::Start()
 {
   PWaitAndSignal m(mutex);
   
   if (runMonitorThread && updateThread != NULL)
-    return PFalse; // Already running
+    return false; // Already running
 
   PIPSocket::GetInterfaceTable(currentInterfaces);
   PTRACE(4, "IfaceMon\tInitial interface list:\n" << setfill('\n') << currentInterfaces << setfill(' '));
@@ -121,7 +121,7 @@
     updateThread = new PThreadObj<PInterfaceMonitor>(*this, &PInterfaceMonitor::UpdateThreadMain);
     updateThread->SetThreadName("Network Interface Monitor");
   }
-  return PTrue;
+  return true;
   
 }
 
@@ -152,9 +152,9 @@
   for (PINDEX i = 0; i < list.GetSize(); ++i) {
     PIPSocket::InterfaceEntry & listEntry = list[i];
     if ((entry.GetName() == listEntry.GetName()) && (entry.GetAddress() == listEntry.GetAddress()))
-      return PTrue;
+      return true;
   }
-  return PFalse;
+  return false;
 }
 
 
@@ -164,10 +164,10 @@
   for (PINDEX i = 0; i < subset.GetSize(); ++i) {
     PIPSocket::InterfaceEntry & entry = subset[i];
     if (!IsInterfaceInList(entry, set))
-      return PFalse;
+      return false;
   }
 
-  return PTrue;
+  return true;
 }
 
 
@@ -176,11 +176,11 @@
 {
   // if the sizes are different, then the list has changed. 
   if (list1.GetSize() != list2.GetSize())
-    return PFalse;
+    return false;
 
   // ensure every element in list1 is in list2
   if (!InterfaceListIsSubsetOf(list1, list2))
-    return PFalse;
+    return false;
 
   // ensure every element in list1 is in list2
   return InterfaceListIsSubsetOf(list2, list1);
@@ -252,7 +252,7 @@
                                       PString & name)
 {
   if (iface.IsEmpty())
-    return PFalse;
+    return false;
 
   PINDEX percent = iface.Find('%');
   switch (percent) {
@@ -282,13 +282,13 @@
 {
   if ((addr.IsAny()   || entry.GetAddress() == addr) &&
       (name.IsEmpty() || entry.GetName().NumCompare(name) == PString::EqualTo)) {
-    return PTrue;
+    return true;
   }
-  return PFalse;
+  return false;
 }
 
 
-PStringArray PInterfaceMonitor::GetInterfaces(PBoolean includeLoopBack, 
+PStringArray PInterfaceMonitor::GetInterfaces(bool includeLoopBack, 
                                               const PIPSocket::Address & destination)
 {
   PWaitAndSignal guard(mutex);
@@ -316,30 +316,30 @@
 }
 
 
-PBoolean PInterfaceMonitor::IsValidBindingForDestination(const PIPSocket::Address & binding,
+bool PInterfaceMonitor::IsValidBindingForDestination(const PIPSocket::Address & binding,
                                                      const PIPSocket::Address & destination)
 {
   PWaitAndSignal guard(mutex);
   
   if (interfaceFilter == NULL)
-    return PTrue;
+    return true;
   
   PIPSocket::InterfaceTable ifaces = currentInterfaces;
   ifaces = interfaceFilter->FilterInterfaces(destination, ifaces);
   for (PINDEX i = 0; i < ifaces.GetSize(); i++) {
     if (ifaces[i].GetAddress() == binding)
-      return PTrue;
+      return true;
   }
-  return PFalse;
+  return false;
 }
 
 
-PBoolean PInterfaceMonitor::GetInterfaceInfo(const PString & iface, PIPSocket::InterfaceEntry & info)
+bool PInterfaceMonitor::GetInterfaceInfo(const PString & iface, PIPSocket::InterfaceEntry & info)
 {
   PIPSocket::Address addr;
   PString name;
   if (!SplitInterfaceDescription(iface, addr, name))
-    return PFalse;
+    return false;
 
   PWaitAndSignal m(mutex);
 
@@ -347,15 +347,15 @@
     PIPSocket::InterfaceEntry & entry = currentInterfaces[i];
     if (InterfaceMatches(addr, name, entry)) {
       info = entry;
-      return PTrue;
+      return true;
     }
   }
 
-  return PFalse;
+  return false;
 }
 
 
-PBoolean PInterfaceMonitor::IsMatchingInterface(const PString & iface, const PIPSocket::InterfaceEntry & entry)
+bool PInterfaceMonitor::IsMatchingInterface(const PString & iface, const PIPSocket::InterfaceEntry & entry)
 {
   PIPSocket::Address addr;
   PString name;
@@ -440,16 +440,16 @@
 
 //////////////////////////////////////////////////
 
-PMonitoredSockets::PMonitoredSockets(PBoolean reuseAddr, PSTUNClient * stunClient)
+PMonitoredSockets::PMonitoredSockets(bool reuseAddr, PSTUNClient * stunClient)
   : localPort(0)
   , reuseAddress(reuseAddr)
   , stun(stunClient)
-  , opened(PFalse)
+  , opened(false)
 {
 }
 
 
-PBoolean PMonitoredSockets::CreateSocket(SocketInfo & info, const PIPSocket::Address & binding)
+bool PMonitoredSockets::CreateSocket(SocketInfo & info, const PIPSocket::Address & binding)
 {
   delete info.socket;
   info.socket = NULL;
@@ -463,7 +463,7 @@
         PTRACE(4, "MonSock\tCreated bundled UDP socket via STUN internal="
                << binding << ':' << info.socket->PUDPSocket::GetPort()
                << " external=" << info.socket->GetLocalAddress());
-        return PTrue;
+        return true;
       }
     }
   }
@@ -480,10 +480,10 @@
 }
 
 
-PBoolean PMonitoredSockets::DestroySocket(SocketInfo & info)
+bool PMonitoredSockets::DestroySocket(SocketInfo & info)
 {
   if (info.socket == NULL)
-    return PFalse;
+    return false;
 
   PBoolean result = info.socket->Close();
   PTRACE_IF(4, result, "MonSock\tClosed bundled UDP socket " << info.socket);
@@ -494,7 +494,7 @@
     UnlockReadWrite();
     PThread::Sleep(20);
     if (!LockReadWrite())
-      return PFalse;
+      return false;
     if (--failSafe == 0) {
       PTRACE(1, "MonSock\tClose of bundled UDP socket " << info.socket << " taking too long.");
       break;
@@ -508,13 +508,13 @@
 }
 
 
-PBoolean PMonitoredSockets::GetSocketAddress(const SocketInfo & info,
+bool PMonitoredSockets::GetSocketAddress(const SocketInfo & info,
                                          PIPSocket::Address & address,
                                          WORD & port,
-                                         PBoolean usingNAT) const
+                                         bool usingNAT) const
 {
   if (info.socket == NULL)
-    return PFalse;
+    return false;
 
   return usingNAT ? info.socket->GetLocalAddress(address, port)
                   : info.socket->PUDPSocket::GetLocalAddress(address, port);
@@ -623,7 +623,7 @@
 }
 
 
-PMonitoredSockets * PMonitoredSockets::Create(const PString & iface, PBoolean reuseAddr, PSTUNClient * stunClient)
+PMonitoredSockets * PMonitoredSockets::Create(const PString & iface, bool reuseAddr, PSTUNClient * stunClient)
 {
   if (iface.IsEmpty() || iface == "*" || PIPSocket::Address(iface).IsAny())
     return new PMonitoredSocketBundle(reuseAddr, stunClient);
@@ -641,11 +641,11 @@
 
 //////////////////////////////////////////////////
 
-PMonitoredSocketChannel::PMonitoredSocketChannel(const PMonitoredSocketsPtr & sock, PBoolean shared)
+PMonitoredSocketChannel::PMonitoredSocketChannel(const PMonitoredSocketsPtr & sock, bool shared)
   : socketBundle(sock)
   , sharedBundle(shared)
   , promiscuousReads(false)
-  , closing(PFalse)
+  , closing(false)
   , remotePort(0)
   , lastReceivedAddress(PIPSocket::GetDefaultIpAny())
   , lastReceivedPort(0)
@@ -661,7 +661,7 @@
 
 PBoolean PMonitoredSocketChannel::Close()
 {
-  closing = PTrue;
+  closing = true;
   return sharedBundle || socketBundle == NULL || socketBundle->Close();
 }
 
@@ -669,18 +669,18 @@
 PBoolean PMonitoredSocketChannel::Read(void * buffer, PINDEX length)
 {
   if (!IsOpen())
-    return PFalse;
+    return false;
 
   do {
-    PString iface = GetInterface();
+    lastReceivedInterface = GetInterface();
     if (!SetErrorValues(socketBundle->ReadFromBundle(buffer, length,
                                                      lastReceivedAddress, lastReceivedPort,
-                                                     iface, lastReadCount, readTimeout),
+                                                     lastReceivedInterface, lastReadCount, readTimeout),
                         0, LastReadError))
-      return PFalse;
+      return false;
 
     if (promiscuousReads)
-      return PTrue;
+      return true;
 
     if (remoteAddress.IsAny())
       remoteAddress = lastReceivedAddress;
@@ -688,7 +688,7 @@
       remotePort = lastReceivedPort;
 
   } while (remoteAddress != lastReceivedAddress || remotePort != lastReceivedPort);
-  return PTrue;
+  return true;
 }
 
 
@@ -709,6 +709,9 @@
     currentInterface = MakeInterfaceDescription(info);
   else
     currentInterface = iface;
+
+  if (lastReceivedInterface.IsEmpty())
+    lastReceivedInterface = currentInterface;
 }
 
 
@@ -721,7 +724,7 @@
 }
 
 
-PBoolean PMonitoredSocketChannel::GetLocal(PIPSocket::Address & address, WORD & port, PBoolean usingNAT)
+bool PMonitoredSocketChannel::GetLocal(PIPSocket::Address & address, WORD & port, bool usingNAT)
 {
   return socketBundle->GetAddress(GetInterface(), address, port, usingNAT);
 }
@@ -748,7 +751,7 @@
 
 //////////////////////////////////////////////////
 
-PMonitoredSocketBundle::PMonitoredSocketBundle(PBoolean reuseAddr, PSTUNClient * stunClient)
+PMonitoredSocketBundle::PMonitoredSocketBundle(bool reuseAddr, PSTUNClient * stunClient)
   : PMonitoredSockets(reuseAddr, stunClient)
 {
 }
@@ -765,9 +768,9 @@
   PSafeLockReadWrite guard(*this);
 
   if (IsOpen() && localPort != 0  && localPort == port)
-    return PTrue;
+    return true;
 
-  opened = PTrue;
+  opened = true;
 
   localPort = port;
 
@@ -779,16 +782,16 @@
   for (PINDEX i = 0; i < interfaces.GetSize(); ++i)
     OpenSocket(interfaces[i]);
 
-  return PTrue;
+  return true;
 }
 
 
 PBoolean PMonitoredSocketBundle::Close()
 {
   if (!LockReadWrite())
-    return PFalse;
+    return false;
 
-  opened = PFalse;
+  opened = false;
 
   while (!socketInfoMap.empty())
     CloseSocket(socketInfoMap.begin());
@@ -796,7 +799,7 @@
 
   UnlockReadWrite();
 
-  return PTrue;
+  return true;
 }
 
 
@@ -808,12 +811,12 @@
   if (iface.IsEmpty()) {
     address = PIPSocket::GetDefaultIpAny();
     port = localPort;
-    return PTrue;
+    return true;
   }
 
   PSafeLockReadOnly guard(*this);
   if (!guard.IsLocked())
-    return PFalse;
+    return false;
 
   SocketInfoMap_T::const_iterator iter = socketInfoMap.find(iface);
   return iter != socketInfoMap.end() && GetSocketAddress(iter->second, address, port, usingNAT);
@@ -982,7 +985,7 @@
 
 //////////////////////////////////////////////////
 
-PSingleMonitoredSocket::PSingleMonitoredSocket(const PString & _theInterface, PBoolean reuseAddr, PSTUNClient * stunClient)
+PSingleMonitoredSocket::PSingleMonitoredSocket(const PString & _theInterface, bool reuseAddr, PSTUNClient * stunClient)
   : PMonitoredSocketBundle(reuseAddr, stunClient)
   , theInterface(_theInterface)
 {
@@ -1011,9 +1014,9 @@
   PSafeLockReadWrite guard(*this);
 
   if (opened && theInfo.socket != NULL && theInfo.socket->IsOpen())
-    return PFalse;
+    return false;
 
-  opened = PTrue;
+  opened = true;
 
   localPort = port;
 
@@ -1021,13 +1024,13 @@
     GetInterfaceInfo(theInterface, theEntry);
 
   if (theEntry.GetAddress().IsAny())
-    return PTrue;
+    return true;
 
   if (!CreateSocket(theInfo, theEntry.GetAddress()))
-    return PFalse;
+    return false;
 
   localPort = theInfo.socket->PUDPSocket::GetPort();
-  return PTrue;
+  return true;
 }
 
 
@@ -1035,7 +1038,7 @@
 {
   PSafeLockReadWrite guard(*this);
 
-  opened = PFalse;
+  opened = false;
   interfaceAddedSignal.Close(); // Fail safe break out of Select()
   return DestroySocket(theInfo);
 }
@@ -1125,10 +1128,10 @@
 }
 
 
-PBoolean PSingleMonitoredSocket::IsInterface(const PString & iface) const
+bool PSingleMonitoredSocket::IsInterface(const PString & iface) const
 {
   if (iface.IsEmpty())
-    return PTrue;
+    return true;
 
   PINDEX percent1 = iface.Find('%');
   PINDEX percent2 = theInterface.Find('%');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip: [19210] ptlib/trunk

From: <rjongbloed@us...> - 2008-01-07 11:22

Revision: 19210
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19210&view=rev
Author:   rjongbloed
Date:     2008-01-07 03:22:04 -0800 (Mon, 07 Jan 2008)

Log Message:
-----------
Fixed a number of build issues when various subsystems are disabled.

Modified Paths:
--------------
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in
    ptlib/trunk/include/ptclib/httpform.h
    ptlib/trunk/include/ptclib/modem.h
    ptlib/trunk/include/ptclib/psoap.h
    ptlib/trunk/include/ptclib/pxmlrpc.h
    ptlib/trunk/include/ptclib/url.h
    ptlib/trunk/include/ptlib/serchan.h
    ptlib/trunk/src/ptclib/http.cxx
    ptlib/trunk/src/ptclib/httpform.cxx
    ptlib/trunk/src/ptclib/modem.cxx
    ptlib/trunk/src/ptclib/psoap.cxx
    ptlib/trunk/src/ptclib/pxml.cxx
    ptlib/trunk/src/ptclib/pxmlrpc.cxx
    ptlib/trunk/src/ptclib/pxmlrpcs.cxx
    ptlib/trunk/src/ptclib/socks.cxx
    ptlib/trunk/src/ptlib/common/pconfig.cxx
    ptlib/trunk/src/ptlib/common/serial.cxx
    ptlib/trunk/src/ptlib/msos/Console_2005.vcproj
    ptlib/trunk/src/ptlib/msos/ptlib.cxx
    ptlib/trunk/src/ptlib/msos/svcproc.cxx
    ptlib/trunk/src/ptlib/msos/wincfg.cxx
    ptlib/trunk/src/ptlib/unix/Makefile

Added Paths:
-----------
    ptlib/trunk/src/ptclib/url.cxx

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/configure.ac	2008-01-07 11:22:04 UTC (rev 19210)
@@ -539,7 +539,9 @@
 default_pop3smtp=yes
 default_audio=yes
 default_video=yes
+default_url=yes
 default_http=yes
+default_httpforms=yes
 default_httpsvc=yes
 default_soap=yes
 default_xmlrpc=yes
@@ -577,7 +579,9 @@
   default_pop3smtp=no
   default_audio=yes
   default_video=yes
+  default_url=yes
   default_http=yes
+  default_httpforms=no
   default_httpsvc=no
   default_soap=no
   default_xmlrpc=no
@@ -614,7 +618,9 @@
   default_pop3smtp=no
   default_audio=yes
   default_video=yes
+  default_url=yes
   default_http=yes
+  default_httpforms=no
   default_httpsvc=no
   default_soap=no
   default_xmlrpc=no
@@ -1394,7 +1400,116 @@
 AC_SUBST(P_STATIC_ENDLDLIBS)
 AC_SUBST(P_STATIC_LDFLAGS)
 
+
 dnl ########################################################################
+dnl check for URL support
+
+dnl MSWIN_DISPLAY    url,URL Support
+dnl MSWIN_DEFINE     url,P_URL
+
+AC_ARG_ENABLE(url,
+       [  --disable-url          disable URL support])
+
+if test "${enable_url}z" = "z" ; then
+  enable_url=$default_url
+fi
+
+HAS_URL=
+if test "$enable_url" = "no" ; then
+  AC_MSG_NOTICE(URL protocol support disabled)
+else
+  HAS_URL=1
+  AC_DEFINE(P_URL, 1)
+fi
+AC_SUBST(HAS_URL)
+
+
+dnl ########################################################################
+dnl check for HTTP support
+
+dnl MSWIN_DISPLAY    http,HTTP Support
+dnl MSWIN_DEFINE     http,P_HTTP
+dnl MSWIN_IF_FEATURE http,url
+
+AC_ARG_ENABLE(http,
+       [  --disable-http          disable HTTP support])
+
+HAS_HTTP=
+if test "$enable_url" = "no" ; then
+  AC_MSG_NOTICE(HTTP disabled as URL is disabled)
+else
+  if test "${enable_http}z" = "z" ; then
+    enable_http=$default_http
+  fi
+
+  if test "$enable_http" = "no" ; then
+    AC_MSG_NOTICE(HTTP protocol support disabled)
+  else
+    HAS_HTTP=1
+    AC_DEFINE(P_HTTP, 1)
+  fi
+fi
+AC_SUBST(HAS_HTTP)
+
+
+dnl ########################################################################
+dnl check for HTTPFORMS support
+
+dnl MSWIN_DISPLAY    httpforms,HTTP forms Support
+dnl MSWIN_DEFINE     httpforms,P_HTTPFORMS
+dnl MSWIN_IF_FEATURE httpforms,http
+dnl MSWIN_IF_FEATURE httpforms,configfile
+
+AC_ARG_ENABLE(httpforms,
+       [  --disable-httpforms       disable HTTP forms support])
+
+HAS_HTTPFORMS=
+if test "$enable_url" = "no" ; then
+  AC_MSG_NOTICE(HTTP forms disabled as HTTP is disabled)
+else
+  if test "${enable_httpforms}z" = "z" ; then
+    enable_httpforms=$default_httpsvc
+  fi
+
+  if test "$enable_httpforms" = "no" ; then
+    AC_MSG_NOTICE(HTTP forms support disabled)
+  else
+    HAS_HTTPFORMS=1
+    AC_DEFINE(P_HTTPFORMS, 1)
+  fi
+fi
+AC_SUBST(HAS_HTTPFORMS)
+
+
+dnl ########################################################################
+dnl check for HTTPSVC support
+
+dnl MSWIN_DISPLAY    httpsvc,HTTP service Support
+dnl MSWIN_DEFINE     httpsvc,P_HTTPSVC
+dnl MSWIN_IF_FEATURE httpsvc,httpforms
+
+AC_ARG_ENABLE(httpsvc,
+       [  --disable-httpsvc       disable HTTP service support])
+
+HAS_HTTPSVC=
+if test "$enable_url" = "no" ; then
+  AC_MSG_NOTICE(HTTP service disabled as HTTP forms is disabled)
+else
+  if test "${enable_httpsvc}z" = "z" ; then
+    enable_httpsvc=$default_httpsvc
+  fi
+
+  if test "$enable_httpsvc" = "no" ; then
+    AC_MSG_NOTICE(HTTP service support disabled)
+  else
+    HAS_HTTPSVC=1
+    AC_DEFINE(P_HTTPSVC, 1)
+  fi
+fi
+AC_SUBST(HAS_HTTPSVC)
+
+
+dnl ########################################################################
 dnl look for expat XML parser
 
 dnl MSWIN_DISPLAY    expat,Expat XML
@@ -1471,18 +1586,6 @@
 dnl MSWIN_DEFINE     vxml,P_VXML
 dnl MSWIN_IF_FEATURE vxml,expat|winexpat
 
-dnl MSWIN_DISPLAY    jabber,Jabber
-dnl MSWIN_DEFINE     jabber,P_JABBER
-dnl MSWIN_IF_FEATURE jabber,expat|winexpat
-
-dnl MSWIN_DISPLAY    xmlrpc,XMLRPC
-dnl MSWIN_DEFINE     xmlrpc,P_XMLRPC
-dnl MSWIN_IF_FEATURE xmlrpc,expat|winexpat
-
-dnl MSWIN_DISPLAY    soap,SOAP
-dnl MSWIN_DEFINE     soap,P_SOAP
-dnl MSWIN_IF_FEATURE soap,expat|winexpat
-
 HAS_VXML=
 HAS_JABBER=
 HAS_XMLRPC=
@@ -1491,6 +1594,7 @@
   AC_MSG_NOTICE(VXML disabled as Expat is disabled)
   AC_MSG_NOTICE(Jabber disabled as Expat is disabled)
   AC_MSG_NOTICE(XMLRPC disabled as Expat is disabled)
+  AC_MSG_NOTICE(SOAP disabled as Expat is disabled)
 else
 
   dnl ########################################################################
@@ -1512,6 +1616,10 @@
   dnl ########################################################################
   dnl Jabber
 
+  dnl MSWIN_DISPLAY    jabber,Jabber
+  dnl MSWIN_DEFINE     jabber,P_JABBER
+  dnl MSWIN_IF_FEATURE jabber,expat|winexpat
+
   AC_ARG_ENABLE(jabber,
          [  --disable-jabber        disable Jabber support])
 
@@ -1525,37 +1633,52 @@
     HAS_JABBER=1
   fi
 
-  dnl ########################################################################
-  dnl XMLRPC
+  if test "$enable_http" = "no" ; then
+    AC_MSG_NOTICE(XMLRPC disabled as HTTP is disabled)
+    AC_MSG_NOTICE(SOAP disabled as HTTP is disabled)
+  else
+    dnl ########################################################################
+    dnl XMLRPC
 
-  AC_ARG_ENABLE(xmlrpc,
-         [  --disable-xmlrpc        disable XMLRPC support])
+    dnl MSWIN_DISPLAY    xmlrpc,XMLRPC
+    dnl MSWIN_DEFINE     xmlrpc,P_XMLRPC
+    dnl MSWIN_IF_FEATURE xmlrpc,expat|winexpat
+    dnl MSWIN_IF_FEATURE xmlrpc,http
 
-  if test "${enable_xmlrpc}z" = "z" ; then
-    enable_xmlrpc=$default_xmlrpc
-  fi
-  if test "$enable_xmlrpc" = "no" ; then
-    AC_MSG_NOTICE(XMLRPC disabled)
-  else
-    AC_DEFINE(P_XMLRPC, 1)
-     HAS_XMLRPC=1
-  fi
-  
-  dnl ########################################################################
-  dnl SOAP
+    AC_ARG_ENABLE(xmlrpc,
+	 [  --disable-xmlrpc        disable XMLRPC support])
 
-  AC_ARG_ENABLE(soap,
-         [  --disable-soap          disable SOAP support])
+    if test "${enable_xmlrpc}z" = "z" ; then
+      enable_xmlrpc=$default_xmlrpc
+    fi
+    if test "$enable_xmlrpc" = "no" ; then
+      AC_MSG_NOTICE(XMLRPC disabled)
+    else
+      AC_DEFINE(P_XMLRPC, 1)
+      HAS_XMLRPC=1
+    fi
 
-  if test "${enable_soap}z" = "z" ; then
-    enable_soap=$default_soap
+    dnl ########################################################################
+    dnl SOAP
+
+    dnl MSWIN_DISPLAY    soap,SOAP
+    dnl MSWIN_DEFINE     soap,P_SOAP
+    dnl MSWIN_IF_FEATURE soap,expat|winexpat
+    dnl MSWIN_IF_FEATURE soap,http
+
+    AC_ARG_ENABLE(soap,
+	 [  --disable-soap          disable SOAP support])
+
+    if test "${enable_soap}z" = "z" ; then
+      enable_soap=$default_soap
+    fi
+    if test "$enable_soap" = "no" ; then
+      AC_MSG_NOTICE(SOAP disabled)
+    else
+      AC_DEFINE(P_SOAP, 1)
+      HAS_SOAP=1
+    fi
   fi
-  if test "$enable_soap" = "no" ; then
-    AC_MSG_NOTICE(SOAP disabled)
-  else
-    AC_DEFINE(P_SOAP, 1)
-    HAS_SOAP=1
-  fi
 fi
 
 AC_SUBST(HAS_VXML)
@@ -2065,55 +2188,10 @@
 AC_SUBST(HAS_POP3SMTP)
 
 dnl ########################################################################
-dnl check for HTTP support
-
-dnl MSWIN_DISPLAY    http,HTTP Support
-dnl MSWIN_DEFINE     http,P_HTTP
-
-AC_ARG_ENABLE(http,
-       [  --disable-http          disable HTTP support])
-
-if test "${enable_http}z" = "z" ; then
-  enable_http=$default_http
-fi
-
-HAS_HTTP=
-if test "$enable_http" = "no" ; then
-  AC_MSG_NOTICE(HTTP protocol support disabled)
-else
-  HAS_HTTP=1
-  AC_DEFINE(P_HTTP, 1)
-fi
-AC_SUBST(HAS_HTTP)
-
-dnl ########################################################################
-dnl check for HTTPSVC support
-
-dnl MSWIN_DISPLAY    httpsvc,HTTP service Support
-dnl MSWIN_DEFINE     httpsvc,P_HTTPSVC
-dnl MSWIN_IF_FEATURE httpsvc,http
-
-AC_ARG_ENABLE(httpsvc,
-       [  --disable-httpsvc       disable HTTP service support])
-
-if test "${enable_httpsvc}z" = "z" ; then
-  enable_httpsvc=$default_httpsvc
-fi
-
-HAS_HTTPSVC=
-if test "$enable_httpsvc" = "no" ; then
-  AC_MSG_NOTICE(HTTP service support disabled)
-else
-  HAS_HTTPSVC=1
-  AC_DEFINE(P_HTTPSVC, 1)
-fi
-AC_SUBST(HAS_HTTPSVC)
-
-dnl ########################################################################
 dnl check for enabling config file support
 
-dnl MSWIN_DISPLAY    config_file,Config file protocol support
-dnl MSWIN_DEFINE     config_file,P_CONFIG_FILE
+dnl MSWIN_DISPLAY    configfile,Config file protocol support
+dnl MSWIN_DEFINE     configfile,P_CONFIG_FILE
 
 AC_ARG_ENABLE(configfile,
        [  --disable-configfile    disable config file support])

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/include/ptbuildopts.h.in	2008-01-07 11:22:04 UTC (rev 19210)
@@ -497,9 +497,11 @@
 #undef P_JABBER
 #undef P_XMLRPC
 #undef P_SOAP
+#undef P_CONFIG_FILE
+#undef P_URL
+#undef P_HTTP
+#undef P_HTTPFORMS
 #undef P_HTTPSVC
-#undef P_HTTP
-#undef P_CONFIG_FILE
 #undef P_SOCKAGG
 #undef P_VIDFILE
 #undef P_ODBC

Modified: ptlib/trunk/include/ptclib/httpform.h
===================================================================
--- ptlib/trunk/include/ptclib/httpform.h	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/include/ptclib/httpform.h	2008-01-07 11:22:04 UTC (rev 19210)
@@ -28,13 +28,15 @@
  * $Date$
  */
 
-#ifndef _PHTTPFORM
-#define _PHTTPFORM
+#ifndef _PHTTPFORM_H
+#define _PHTTPFORM_H
 
 #ifdef P_USE_PRAGMA
 #pragma interface
 #endif
 
+#if P_HTTPFORMS
+
 #include <ptclib/http.h>
 #include <ptclib/html.h>
 
@@ -892,7 +894,9 @@
 };
 
 
-#endif
+#endif // P_HTTPFORMS
 
+#endif // _HTTPFORM_H
 
+
 // End Of File ///////////////////////////////////////////////////////////////

Modified: ptlib/trunk/include/ptclib/modem.h
===================================================================
--- ptlib/trunk/include/ptclib/modem.h	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/include/ptclib/modem.h	2008-01-07 11:22:04 UTC (rev 19210)
@@ -82,6 +82,7 @@
       FlowControl outputFlow = DefaultFlowControl   ///< Output flow control.
     );
 
+#if P_CONFIG_FILE
     /** Open the modem serial channel obtaining the parameters from standard
        variables in the configuration file. Note that it assumed that the
        correct configuration file section is already set.
@@ -89,6 +90,7 @@
     PModem(
       PConfig & cfg   ///< Configuration file to read parameters from.
     );
+#endif // P_CONFIG_FILE
 
 
   // Overrides from class PChannel
@@ -115,6 +117,7 @@
       FlowControl outputFlow = DefaultFlowControl   ///< Output flow control.
     );
 
+#if P_CONFIG_FILE
     /** Open the modem serial port obtaining the parameters from standard
        variables in the configuration file. Note that it assumed that the
        correct configuration file section is already set.
@@ -130,6 +133,7 @@
       PConfig & cfg   ///< Configuration file to write parameters to.
     );
     // Save the current modem serial port settings into the configuration file.
+#endif // P_CONFIG_FILE
 
 
   // New member functions

Modified: ptlib/trunk/include/ptclib/psoap.h
===================================================================
--- ptlib/trunk/include/ptclib/psoap.h	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/include/ptclib/psoap.h	2008-01-07 11:22:04 UTC (rev 19210)
@@ -37,7 +37,7 @@
 #endif
 
 
-#if P_EXPAT
+#if P_SOAP
 
 #include <ptclib/pxml.h>
 #include <ptclib/http.h>
@@ -228,7 +228,7 @@
 };
 
 
-#endif // P_EXPAT
+#endif // P_SOAP
 
 
 #endif // _PSOAP_H

Modified: ptlib/trunk/include/ptclib/pxmlrpc.h
===================================================================
--- ptlib/trunk/include/ptclib/pxmlrpc.h	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/include/ptclib/pxmlrpc.h	2008-01-07 11:22:04 UTC (rev 19210)
@@ -36,6 +36,9 @@
 #endif
 
 #include <ptclib/pxml.h>
+
+#if P_XMLRPC
+
 #include <ptclib/url.h>
 
 
@@ -473,5 +476,6 @@
 
 /////////////////////////////////////////////////////////////////
 
+#endif // P_XMLRPC
 
-#endif
+#endif // _PXMLRPC_H

Modified: ptlib/trunk/include/ptclib/url.h
===================================================================
--- ptlib/trunk/include/ptclib/url.h	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/include/ptclib/url.h	2008-01-07 11:22:04 UTC (rev 19210)
@@ -28,8 +28,8 @@
  * $Date$
  */
 
-#ifndef _PURL
-#define _PURL
+#ifndef _PURL_H
+#define _PURL_H
 
 #ifdef P_USE_PRAGMA
 #pragma interface
@@ -39,7 +39,9 @@
 #include <ptlib.h>
 #endif
 
+#if P_URL
 
+
 //////////////////////////////////////////////////////////////////////////////
 // PURL
 
@@ -357,6 +359,8 @@
     WORD defaultPort;
 };
 
-#endif
+#endif // P_URL
 
+#endif // _PURL_H
+
 // End Of File ///////////////////////////////////////////////////////////////

Modified: ptlib/trunk/include/ptlib/serchan.h
===================================================================
--- ptlib/trunk/include/ptlib/serchan.h	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/include/ptlib/serchan.h	2008-01-07 11:22:04 UTC (rev 19210)
@@ -120,6 +120,7 @@
       FlowControl outputFlow = DefaultFlowControl      
     );
 
+#if P_CONFIG_FILE
     /**Create a serial channal.
        The channel is opened using attributes obtained from standard variables
        in the configuration file. Note that it assumed that the correct
@@ -128,6 +129,7 @@
     PSerialChannel(
       PConfig & cfg  ///< Configuration file to read serial port attributes from.
     );
+#endif // P_CONFIG_FILE
 
     /// Close the serial channel on destruction.
     ~PSerialChannel();
@@ -170,6 +172,7 @@
       FlowControl outputFlow = DefaultFlowControl      
     );
 
+#if P_CONFIG_FILE
     /**Open a serial channal.
        The channel is opened using attributes obtained from standard variables
        in the configuration file. Note that it assumed that the correct
@@ -178,6 +181,7 @@
     virtual PBoolean Open(
       PConfig & cfg  ///< Configuration file to read serial port attributes from.
     );
+#endif // P_CONFIG_FILE
 
     /**Get a list of the available serial ports. This returns a set of
        platform dependent strings which describe the serial ports of the
@@ -293,12 +297,14 @@
      */
     FlowControl GetOutputFlowControl() const;
 
+#if P_CONFIG_FILE
     /**Save the current port settings into the configuration file. Note that
        it assumed that the correct configuration file section is already set.
      */
     virtual void SaveSettings(
       PConfig & cfg   ///< Configuration file to save setting into.
     );
+#endif // P_CONFIG_FILE
   //@}
 
 

Modified: ptlib/trunk/src/ptclib/http.cxx
===================================================================
--- ptlib/trunk/src/ptclib/http.cxx	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/src/ptclib/http.cxx	2008-01-07 11:22:04 UTC (rev 19210)
@@ -30,844 +30,16 @@
 
 #ifdef __GNUC__
 #pragma implementation "http.h"
-#pragma implementation "url.h"
 #endif
 
 #include <ptlib.h>
 
-#define P_DISABLE_FACTORY_INSTANCES
-#include <ptlib/pfactory.h>
 #include <ptlib/sockets.h>
 #include <ptclib/http.h>
 #include <ptclib/url.h>
 
-#include <ctype.h>
 
-#if defined(WIN32) && !defined(_WIN32_WCE)
-#include <shellapi.h>
-#pragma comment(lib,"shell32.lib")
-#endif
-
-
-// RFC 1738
-// http://host:port/path...
-// https://host:port/path....
-// gopher://host:port
-// wais://host:port
-// nntp://host:port
-// prospero://host:port
-// ftp://user:password@...>...
-// telnet://user:password@...>
-// file://hostname/path...
-
-// mailto:user@...
-// news:string
-
-#define DEFAULT_FTP_PORT      21
-#define DEFAULT_TELNET_PORT   23
-#define DEFAULT_GOPHER_PORT   70
-#define DEFAULT_HTTP_PORT     80
-#define DEFAULT_NNTP_PORT     119
-#define DEFAULT_WAIS_PORT     210
-#define DEFAULT_HTTPS_PORT    443
-#define DEFAULT_RTSP_PORT     554
-#define DEFAULT_RTSPU_PORT    554
-#define DEFAULT_PROSPERO_PORT 1525
-#define DEFAULT_H323_PORT     1720
-#define DEFAULT_H323S_PORT    1300
-#define DEFAULT_H323RAS_PORT  1719
-#define DEFAULT_SIP_PORT      5060
-#define DEFAULT_SIPS_PORT     5061
-
-#define DEFINE_LEGACY_URL_SCHEME(schemeName, user, pass, host, def, defhost, query, params, frags, path, rel, port) \
-class PURLLegacyScheme_##schemeName : public PURLLegacyScheme \
-{ \
-  public: \
-    PURLLegacyScheme_##schemeName() \
-    : PURLLegacyScheme(#schemeName )  \
-    { \
-      hasUsername           = user; \
-      hasPassword           = pass; \
-      hasHostPort           = host; \
-      defaultToUserIfNoAt   = def; \
-      defaultHostToLocal    = defhost; \
-      hasQuery              = query; \
-      hasParameters         = params; \
-      hasFragments          = frags; \
-      hasPath               = path; \
-      relativeImpliesScheme = rel; \
-      defaultPort           = port; \
-    } \
-}; \
-  static PFactory<PURLScheme>::Worker<PURLLegacyScheme_##schemeName> schemeName##Factory(#schemeName, true); \
-
-DEFINE_LEGACY_URL_SCHEME(http,      PTrue,  PTrue,  PTrue,  PFalse, PTrue,   PTrue,  PTrue,  PTrue,  PTrue,  PTrue,  DEFAULT_HTTP_PORT )
-DEFINE_LEGACY_URL_SCHEME(file,      PFalse, PFalse, PTrue,  PFalse, PTrue,   PFalse, PFalse, PFalse, PTrue,  PFalse, 0)
-DEFINE_LEGACY_URL_SCHEME(https,     PFalse, PFalse, PTrue,  PFalse, PTrue,   PTrue,  PTrue,  PTrue,  PTrue,  PTrue,  DEFAULT_HTTPS_PORT)
-DEFINE_LEGACY_URL_SCHEME(gopher,    PFalse, PFalse, PTrue,  PFalse, PTrue,   PFalse, PFalse, PFalse, PTrue,  PFalse, DEFAULT_GOPHER_PORT)
-DEFINE_LEGACY_URL_SCHEME(wais,      PFalse, PFalse, PTrue,  PFalse, PFalse,  PFalse, PFalse, PFalse, PTrue,  PFalse, DEFAULT_WAIS_PORT)
-DEFINE_LEGACY_URL_SCHEME(nntp,      PFalse, PFalse, PTrue,  PFalse, PTrue,   PFalse, PFalse, PFalse, PTrue,  PFalse, DEFAULT_NNTP_PORT)
-DEFINE_LEGACY_URL_SCHEME(prospero,  PFalse, PFalse, PTrue,  PFalse, PTrue,   PFalse, PFalse, PFalse, PTrue,  PFalse, DEFAULT_PROSPERO_PORT)
-DEFINE_LEGACY_URL_SCHEME(rtsp,      PFalse, PFalse, PTrue,  PFalse, PTrue,   PTrue,  PFalse, PFalse, PTrue,  PFalse, DEFAULT_RTSP_PORT)
-DEFINE_LEGACY_URL_SCHEME(rtspu,     PFalse, PFalse, PTrue,  PFalse, PTrue,   PFalse, PFalse, PFalse, PTrue,  PFalse, DEFAULT_RTSPU_PORT)
-DEFINE_LEGACY_URL_SCHEME(ftp,       PTrue,  PTrue,  PTrue,  PFalse, PTrue,   PFalse, PFalse, PFalse, PTrue,  PFalse, DEFAULT_FTP_PORT)
-DEFINE_LEGACY_URL_SCHEME(telnet,    PTrue,  PTrue,  PTrue,  PFalse, PTrue,   PFalse, PFalse, PFalse, PFalse, PFalse, DEFAULT_TELNET_PORT)
-DEFINE_LEGACY_URL_SCHEME(mailto,    PFalse, PFalse, PFalse, PFalse, PTrue,   PTrue,  PFalse, PFalse, PFalse, PFalse, 0)
-DEFINE_LEGACY_URL_SCHEME(news,      PFalse, PFalse, PFalse, PFalse, PTrue,   PFalse, PFalse, PFalse, PFalse, PFalse, 0)
-DEFINE_LEGACY_URL_SCHEME(h323,      PTrue,  PFalse, PTrue,  PTrue,  PFalse,  PFalse, PTrue,  PFalse, PFalse, PFalse, DEFAULT_H323_PORT)
-DEFINE_LEGACY_URL_SCHEME(h323s,     PTrue,  PFalse, PTrue,  PTrue,  PFalse,  PFalse, PTrue,  PFalse, PFalse, PFalse, DEFAULT_H323S_PORT)
-DEFINE_LEGACY_URL_SCHEME(sip,       PTrue,  PTrue,  PTrue,  PFalse, PFalse,  PFalse, PTrue,  PFalse, PFalse, PFalse, DEFAULT_SIP_PORT)
-DEFINE_LEGACY_URL_SCHEME(sips,      PTrue,  PTrue,  PTrue,  PFalse, PFalse,  PFalse, PTrue,  PFalse, PFalse, PFalse, DEFAULT_SIPS_PORT)
-DEFINE_LEGACY_URL_SCHEME(tel,       PFalse, PFalse, PFalse, PTrue,  PFalse,  PFalse, PTrue,  PFalse, PFalse, PFalse, 0)
-DEFINE_LEGACY_URL_SCHEME(fax,       PFalse, PFalse, PFalse, PTrue,  PFalse,  PFalse, PTrue,  PFalse, PFalse, PFalse, 0)
-DEFINE_LEGACY_URL_SCHEME(callto,    PFalse, PFalse, PFalse, PTrue,  PFalse,  PFalse, PTrue,  PFalse, PFalse, PFalse, 0)
-
-PINSTANTIATE_FACTORY(PURLScheme, PString)
-
-#define DEFAULT_SCHEME "http"
-#define FILE_SCHEME    "file"
-
 //////////////////////////////////////////////////////////////////////////////
-// PURL
-
-PURL::PURL()
-  : //scheme(SchemeTable[DEFAULT_SCHEME].name),
-    scheme(DEFAULT_SCHEME),
-    port(0),
-    portSupplied (PFalse),
-    relativePath(PFalse)
-{
-}
-
-
-PURL::PURL(const char * str, const char * defaultScheme)
-{
-  Parse(str, defaultScheme);
-}
-
-
-PURL::PURL(const PString & str, const char * defaultScheme)
-{
-  Parse(str, defaultScheme);
-}
-
-
-PURL::PURL(const PFilePath & filePath)
-  : //scheme(SchemeTable[FILE_SCHEME].name),
-    scheme(FILE_SCHEME),
-    port(0),
-    portSupplied (PFalse),
-    relativePath(PFalse)
-{
-  PStringArray pathArray = filePath.GetDirectory().GetPath();
-  hostname = pathArray[0];
-
-  PINDEX i;
-  for (i = 1; i < pathArray.GetSize(); i++)
-    pathArray[i-1] = pathArray[i];
-  pathArray[i-1] = filePath.GetFileName();
-
-  SetPath(pathArray);
-}
-
-
-PObject::Comparison PURL::Compare(const PObject & obj) const
-{
-  PAssert(PIsDescendant(&obj, PURL), PInvalidCast);
-  return urlString.Compare(((const PURL &)obj).urlString);
-}
-
-
-PINDEX PURL::HashFunction() const
-{
-  return urlString.HashFunction();
-}
-
-
-void PURL::PrintOn(ostream & stream) const
-{
-  stream << urlString;
-}
-
-
-void PURL::ReadFrom(istream & stream)
-{
-  PString s;
-  stream >> s;
-  Parse(s);
-}
-
-
-PString PURL::TranslateString(const PString & str, TranslationType type)
-{
-  PString xlat = str;
-
-  PString safeChars = "abcdefghijklmnopqrstuvwxyz"
-                      "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                      "0123456789$-_.!*'(),";
-  switch (type) {
-    case LoginTranslation :
-      safeChars += "+;?&=";
-      break;
-
-    case PathTranslation :
-      safeChars += "+:@&=";
-      break;
-
-    case QueryTranslation :
-      safeChars += ":@";
-  }
-  PINDEX pos = (PINDEX)-1;
-  while ((pos = xlat.FindSpan(safeChars, pos+1)) != P_MAX_INDEX)
-    xlat.Splice(psprintf("%%%02X", (BYTE)xlat[pos]), pos, 1);
-
-  if (type == QueryTranslation) {
-    PINDEX space = (PINDEX)-1;
-    while ((space = xlat.Find(' ', space+1)) != P_MAX_INDEX)
-      xlat[space] = '+';
-  }
-
-  return xlat;
-}
-
-
-PString PURL::UntranslateString(const PString & str, TranslationType type)
-{
-  PString xlat = str;
-  xlat.MakeUnique();
-
-  PINDEX pos;
-  if (type == PURL::QueryTranslation) {
-    pos = (PINDEX)-1;
-    while ((pos = xlat.Find('+', pos+1)) != P_MAX_INDEX)
-      xlat[pos] = ' ';
-  }
-
-  pos = (PINDEX)-1;
-  while ((pos = xlat.Find('%', pos+1)) != P_MAX_INDEX) {
-    int digit1 = xlat[pos+1];
-    int digit2 = xlat[pos+2];
-    if (isxdigit(digit1) && isxdigit(digit2)) {
-      xlat[pos] = (char)(
-            (isdigit(digit2) ? (digit2-'0') : (toupper(digit2)-'A'+10)) +
-           ((isdigit(digit1) ? (digit1-'0') : (toupper(digit1)-'A'+10)) << 4));
-      xlat.Delete(pos+1, 2);
-    }
-  }
-
-  return xlat;
-}
-
-
-static void SplitVars(const PString & str, PStringToString & vars, char sep1, char sep2)
-{
-  PINDEX sep1prev = 0;
-  do {
-    PINDEX sep1next = str.Find(sep1, sep1prev);
-    if (sep1next == P_MAX_INDEX)
-      sep1next--; // Implicit assumption string is not a couple of gigabytes long ...
-
-    PINDEX sep2pos = str.Find(sep2, sep1prev);
-    if (sep2pos > sep1next)
-      sep2pos = sep1next;
-
-    PCaselessString key = PURL::UntranslateString(str(sep1prev, sep2pos-1), PURL::QueryTranslation);
-    if (!key) {
-      PString data = PURL::UntranslateString(str(sep2pos+1, sep1next-1), PURL::QueryTranslation);
-
-      if (vars.Contains(key))
-        vars.SetAt(key, vars[key] + ',' + data);
-      else
-        vars.SetAt(key, data);
-    }
-
-    sep1prev = sep1next+1;
-  } while (sep1prev != P_MAX_INDEX);
-}
-
-
-void PURL::SplitQueryVars(const PString & queryStr, PStringToString & queryVars)
-{
-  SplitVars(queryStr, queryVars, '&', '=');
-}
-
-
-PBoolean PURL::InternalParse(const char * cstr, const char * defaultScheme)
-{
-  urlString = cstr;
-
-  scheme.MakeEmpty();
-  username.MakeEmpty();
-  password.MakeEmpty();
-  hostname.MakeEmpty();
-  port = 0;
-  portSupplied = PFalse;
-  relativePath = PFalse;
-  pathStr.MakeEmpty();
-  path.SetSize(0);
-  paramVars.RemoveAll();
-  fragment.MakeEmpty();
-  queryVars.RemoveAll();
-
-  // copy the string so we can take bits off it
-  while (((*cstr & 0x80) == 0x00) && isspace(*cstr))
-    cstr++;
-  PString url = cstr;
-
-  // Character set as per RFC2396
-  PINDEX pos = 0;
-  while ( ((*cstr & 0x80) != 0x00) || isalnum(url[pos]) || url[pos] == '+' || url[pos] == '-' || url[pos] == '.')
-    pos++;
-
-  PString schemeName;
-
-  // get information which tells us how to parse URL for this
-  // particular scheme
-  PURLScheme * schemeInfo = NULL;
-
-  // Determine if the URL has an explicit scheme
-  if (url[pos] == ':') {
-
-    // get the scheme information, or get the default scheme
-    schemeInfo = PFactory<PURLScheme>::CreateInstance(url.Left(pos));
-    if (schemeInfo == NULL && defaultScheme == NULL) {
-      PFactory<PURLScheme>::KeyList_T keyList = PFactory<PURLScheme>::GetKeyList();
-      if (keyList.size() != 0)
-        schemeInfo = PFactory<PURLScheme>::CreateInstance(keyList[0]);
-    }
-    if (schemeInfo != NULL)
-      url.Delete(0, pos+1);
-  }
-
-  // if we could not match a scheme, then use the specified default scheme
-  if (schemeInfo == NULL && defaultScheme != NULL)
-    schemeInfo = PFactory<PURLScheme>::CreateInstance(defaultScheme);
-
-  // if that still fails, then use the global default scheme
-  if (schemeInfo == NULL)
-    schemeInfo = PFactory<PURLScheme>::CreateInstance(DEFAULT_SCHEME);
-
-  // if that fails, then there is nowehere to go
-  PAssert(schemeInfo != NULL, "Default scheme not available");
-  scheme = schemeInfo->GetName();
-  if (!schemeInfo->Parse(url, *this))
-    return PFalse;
-
-  return !IsEmpty();
-}
-
-PBoolean PURL::LegacyParse(const PString & _url, const PURLLegacyScheme * schemeInfo)
-{
-  PString url = _url;
-  PINDEX pos;
-
-  // Super special case!
-  if (scheme *= "callto") {
-
-    // Actually not part of MS spec, but a lot of people put in the // into
-    // the URL, so we take it out of it is there.
-    if (url.GetLength() > 2 && url[0] == '/' && url[1] == '/')
-      url.Delete(0, 2);
-
-    // For some bizarre reason callto uses + instead of ; for paramters
-    // We do a loop so that phone numbers of the form +61243654666 still work
-    do {
-      pos = url.Find('+');
-    } while (pos != P_MAX_INDEX && isdigit(url[pos+1]));
-
-    if (pos != P_MAX_INDEX) {
-      SplitVars(url(pos+1, P_MAX_INDEX), paramVars, '+', '=');
-      url.Delete(pos, P_MAX_INDEX);
-    }
-
-    hostname = paramVars("gateway");
-    if (!hostname)
-      username = UntranslateString(url, LoginTranslation);
-    else {
-      PCaselessString type = paramVars("type");
-      if (type == "directory") {
-        pos = url.Find('/');
-        if (pos == P_MAX_INDEX)
-          username = UntranslateString(url, LoginTranslation);
-        else {
-          hostname = UntranslateString(url.Left(pos), LoginTranslation);
-          username = UntranslateString(url.Mid(pos+1), LoginTranslation);
-        }
-      }
-      else {
-        // Now look for an @ and split user and host
-        pos = url.Find('@');
-        if (pos != P_MAX_INDEX) {
-          username = UntranslateString(url.Left(pos), LoginTranslation);
-          hostname = UntranslateString(url.Mid(pos+1), LoginTranslation);
-        }
-        else {
-          if (type == "ip" || type == "host")
-            hostname = UntranslateString(url, LoginTranslation);
-          else
-            username = UntranslateString(url, LoginTranslation);
-        }
-      }
-    }
-
-    // Allow for [ipv6] form
-    pos = hostname.Find(']');
-    if (pos == P_MAX_INDEX)
-      pos = 0;
-    pos = hostname.Find(':', pos);
-    if (pos != P_MAX_INDEX) {
-      port = (WORD)hostname.Mid(pos+1).AsUnsigned();
-      portSupplied = PTrue;
-      hostname.Delete(pos, P_MAX_INDEX);
-    }
-
-    password = paramVars("password");
-    return PTrue;
-  }
-
-  // if the URL should have leading slash, then remove it if it has one
-  if (schemeInfo != NULL && schemeInfo->hasHostPort && schemeInfo->hasPath) {
-    if (url.GetLength() > 2 && url[0] == '/' && url[1] == '/')
-      url.Delete(0, 2);
-    else
-      relativePath = PTrue;
-  }
-
-  // parse user/password/host/port
-  if (!relativePath && schemeInfo->hasHostPort) {
-    PString endHostChars;
-    if (schemeInfo->hasPath)
-      endHostChars += '/';
-    if (schemeInfo->hasQuery)
-      endHostChars += '?';
-    if (schemeInfo->hasParameters)
-      endHostChars += ';';
-    if (schemeInfo->hasFragments)
-      endHostChars += '#';
-    if (endHostChars.IsEmpty())
-      pos = P_MAX_INDEX;
-    else
-      pos = url.FindOneOf(endHostChars);
-
-    PString uphp = url.Left(pos);
-    if (pos != P_MAX_INDEX)
-      url.Delete(0, pos);
-    else
-      url.MakeEmpty();
-
-    // if the URL is of type UserPasswordHostPort, then parse it
-    if (schemeInfo->hasUsername) {
-      // extract username and password
-      PINDEX pos2 = uphp.Find('@');
-      PINDEX pos3 = P_MAX_INDEX;
-      if (schemeInfo->hasPassword)
-        pos3 = uphp.Find(':');
-      switch (pos2) {
-        case 0 :
-          uphp.Delete(0, 1);
-          break;
-
-        case P_MAX_INDEX :
-          if (schemeInfo->defaultToUserIfNoAt) {
-            if (pos3 == P_MAX_INDEX)
-              username = UntranslateString(uphp, LoginTranslation);
-            else {
-              username = UntranslateString(uphp.Left(pos3), LoginTranslation);
-              password = UntranslateString(uphp.Mid(pos3+1), LoginTranslation);
-            }
-            uphp.MakeEmpty();
-          }
-          break;
-
-        default :
-          if (pos3 > pos2)
-            username = UntranslateString(uphp.Left(pos2), LoginTranslation);
-          else {
-            username = UntranslateString(uphp.Left(pos3), LoginTranslation);
-            password = UntranslateString(uphp(pos3+1, pos2-1), LoginTranslation);
-          }
-          uphp.Delete(0, pos2+1);
-      }
-    }
-
-    // if the URL does not have a port, then this is the hostname
-    if (schemeInfo->defaultPort == 0)
-      hostname = UntranslateString(uphp, LoginTranslation);
-    else {
-      // determine if the URL has a port number
-      // Allow for [ipv6] form
-      pos = uphp.Find(']');
-      if (pos == P_MAX_INDEX)
-        pos = 0;
-      pos = uphp.Find(':', pos);
-      if (pos == P_MAX_INDEX)
-        hostname = UntranslateString(uphp, LoginTranslation);
-      else {
-        hostname = UntranslateString(uphp.Left(pos), LoginTranslation);
-        port = (WORD)uphp.Mid(pos+1).AsUnsigned();
-        portSupplied = PTrue;
-      }
-
-      if (hostname.IsEmpty() && schemeInfo->defaultHostToLocal)
-        hostname = PIPSocket::GetHostName();
-    }
-  }
-
-  if (schemeInfo->hasQuery) {
-    // chop off any trailing query
-    pos = url.Find('?');
-    if (pos != P_MAX_INDEX) {
-      SplitQueryVars(url(pos+1, P_MAX_INDEX), queryVars);
-      url.Delete(pos, P_MAX_INDEX);
-    }
-  }
-
-  if (schemeInfo->hasParameters) {
-    // chop off any trailing parameters
-    pos = url.Find(';');
-    if (pos != P_MAX_INDEX) {
-      SplitVars(url(pos+1, P_MAX_INDEX), paramVars, ';', '=');
-      url.Delete(pos, P_MAX_INDEX);
-    }
-  }
-
-  if (schemeInfo->hasFragments) {
-    // chop off any trailing fragment
-    pos = url.Find('#');
-    if (pos != P_MAX_INDEX) {
-      fragment = UntranslateString(url(pos+1, P_MAX_INDEX), PathTranslation);
-      url.Delete(pos, P_MAX_INDEX);
-    }
-  }
-
-  if (schemeInfo->hasPath)
-    SetPathStr(url);   // the hierarchy is what is left
-  else {
-  // if the rest of the URL isn't a path, then we are finished!
-    pathStr = UntranslateString(url, PathTranslation);
-    Recalculate();
-  }
-
-  if (port == 0 && schemeInfo->defaultPort != 0 && !relativePath) {
-    // Yes another horrible, horrible special case!
-    if (scheme == "h323" && paramVars("type") == "gk")
-      port = DEFAULT_H323RAS_PORT;
-    else
-      port = schemeInfo->defaultPort;
-    Recalculate();
-  }
-
-  return PTrue;
-}
-
-
-PFilePath PURL::AsFilePath() const
-{
-  //if (scheme != SchemeTable[FILE_SCHEME].name)
-  //  return PString::Empty();
-  if (scheme != FILE_SCHEME)
-    return PString::Empty();
-
-  PStringStream str;
-
-  if (relativePath) {
-    for (PINDEX i = 0; i < path.GetSize(); i++) {
-      if (i > 0)
-        str << PDIR_SEPARATOR;
-      str << path[i];
-    }
-  }
-  else {
-    if (hostname != "localhost")
-      str << PDIR_SEPARATOR << hostname;
-    for (PINDEX i = 0; i < path.GetSize(); i++)
-      str << PDIR_SEPARATOR << path[i];
-  }
-
-  return str;
-}
-
-
-PString PURL::AsString(UrlFormat fmt) const
-{
-  if (fmt == FullURL)
-    return urlString;
-
-  if (scheme.IsEmpty())
-    return PString::Empty();
-
-  //const schemeStruct * schemeInfo = GetSchemeInfo(scheme);
-  //if (schemeInfo == NULL)
-  //  schemeInfo = &SchemeTable[PARRAYSIZE(SchemeTable)-1];
-  const PURLScheme * schemeInfo = PFactory<PURLScheme>::CreateInstance(scheme);
-  if (schemeInfo == NULL)
-    schemeInfo = PFactory<PURLScheme>::CreateInstance(DEFAULT_SCHEME);
-
-  return schemeInfo->AsString(fmt, *this);
-}
-
-PString PURL::LegacyAsString(PURL::UrlFormat fmt, const PURLLegacyScheme * schemeInfo) const
-{
-  PStringStream str;
-  PINDEX i;
-
-  if (fmt == HostPortOnly) {
-    if (schemeInfo->hasHostPort && hostname.IsEmpty())
-      return str;
-
-    str << scheme << ':';
-
-    if (relativePath) {
-      if (schemeInfo->relativeImpliesScheme)
-        return PString::Empty();
-      return str;
-    }
-
-    if (schemeInfo->hasPath && schemeInfo->hasHostPort)
-      str << "//";
-
-    if (schemeInfo->hasUsername) {
-      if (!username) {
-        str << TranslateString(username, LoginTranslation);
-        if (schemeInfo->hasPassword && !password)
-          str << ':' << TranslateString(password, LoginTranslation);
-        str << '@';
-      }
-    }
-
-    if (schemeInfo->hasHostPort) {
-      if (hostname.Find(':') != P_MAX_INDEX)
-        str << '[' << hostname << ']';
-      else
-        str << hostname;
-    }
-
-    if (schemeInfo->defaultPort != 0) {
-      if (port != schemeInfo->defaultPort || portSupplied)
-        str << ':' << port;
-    }
-
-    return str;
-  }
-
-  // URIOnly and PathOnly
-  if (schemeInfo->hasPath) {
-    for (i = 0; i < path.GetSize(); i++) {
-      if (i > 0 || !relativePath)
-        str << '/';
-      str << TranslateString(path[i], PathTranslation);
-    }
-  }
-  else
-    str << TranslateString(pathStr, PathTranslation);
-
-  if (fmt == URIOnly) {
-    if (!fragment)
-      str << "#" << TranslateString(fragment, PathTranslation);
-
-    for (i = 0; i < paramVars.GetSize(); i++) {
-      str << ';' << TranslateString(paramVars.GetKeyAt(i), QueryTranslation);
-      PString data = paramVars.GetDataAt(i);
-      if (!data)
-        str << '=' << TranslateString(data, QueryTranslation);
-    }
-
-    if (!queryVars.IsEmpty())
-      str << '?' << GetQuery();
-  }
-
-  return str;
-}
-
-
-void PURL::SetScheme(const PString & s)
-{
-  scheme = s;
-  Recalculate();
-}
-
-
-void PURL::SetUserName(const PString & u)
-{
-  username = u;
-  Recalculate();
-}
-
-
-void PURL::SetPassword(const PString & p)
-{
-  password = p;
-  Recalculate();
-}
-
-
-void PURL::SetHostName(const PString & h)
-{
-  hostname = h;
-  Recalculate();
-}
-
-
-void PURL::SetPort(WORD newPort)
-{
-  port = newPort;
-  Recalculate();
-}
-
-
-void PURL::SetPathStr(const PString & p)
-{
-  pathStr = p;
-
-  path = pathStr.Tokenise("/", PTrue);
-
-  if (path.GetSize() > 0 && path[0].IsEmpty()) 
-    path.RemoveAt(0);
-
-  for (PINDEX i = 0; i < path.GetSize(); i++) {
-    path[i] = UntranslateString(path[i], PathTranslation);
-    if (i > 0 && path[i] == ".." && path[i-1] != "..") {
-      path.RemoveAt(i--);
-      path.RemoveAt(i--);
-    }
-  }
-
-  Recalculate();
-}
-
-
-void PURL::SetPath(const PStringArray & p)
-{
-  path = p;
-
-  pathStr.MakeEmpty();
-  for (PINDEX i = 0; i < path.GetSize(); i++)
-    pathStr += '/' + path[i];
-
-  Recalculate();
-}
-
-
-PString PURL::GetParameters() const
-{
-  PStringStream str;
-
-  for (PINDEX i = 0; i < paramVars.GetSize(); i++) {
-    if (i > 0)
-      str << ';';
-    str << paramVars.GetKeyAt(i);
-    PString data = paramVars.GetDataAt(i);
-    if (!data)
-      str << '=' << data;
-  }
-
-  return str;
-}
-
-
-void PURL::SetParameters(const PString & parameters)
-{
-  SplitVars(parameters, paramVars, ';', '=');
-  Recalculate();
-}
-
-
-void PURL::SetParamVars(const PStringToString & p)
-{
-  paramVars = p;
-  Recalculate();
-}
-
-
-void PURL::SetParamVar(const PString & key, const PString & data)
-{
-  if (data.IsEmpty())
-    paramVars.RemoveAt(key);
-  else
-    paramVars.SetAt(key, data);
-  Recalculate();
-}
-
-
-PString PURL::GetQuery() const
-{
-  PStringStream str;
-
-  for (PINDEX i = 0; i < queryVars.GetSize(); i++) {
-    if (i > 0)
-      str << '&';
-    str << TranslateString(queryVars.GetKeyAt(i), QueryTranslation)
-        << '='
-        << TranslateString(queryVars.GetDataAt(i), QueryTranslation);
-  }
-
-  return str;
-}
-
-
-void PURL::SetQuery(const PString & queryStr)
-{
-  SplitQueryVars(queryStr, queryVars);
-  Recalculate();
-}
-
-
-void PURL::SetQueryVars(const PStringToString & q)
-{
-  queryVars = q;
-  Recalculate();
-}
-
-
-void PURL::SetQueryVar(const PString & key, const PString & data)
-{
-  if (data.IsEmpty())
-    queryVars.RemoveAt(key);
-  else
-    queryVars.SetAt(key, data);
-  Recalculate();
-}
-
-
-PBoolean PURL::OpenBrowser(const PString & url)
-{
-#ifdef WIN32
-  SHELLEXECUTEINFO sei;
-  ZeroMemory(&sei, sizeof(SHELLEXECUTEINFO));
-  sei.cbSize = sizeof(SHELLEXECUTEINFO);
-  sei.lpVerb = TEXT("open");
- #ifndef _WIN32_WCE
-   sei.lpFile = url;
- #else
-  sei.lpFile = url.AsUCS2();
- #endif // _WIN32_WCE
-
-  if (ShellExecuteEx(&sei) != 0)
-    return PTrue;
-
-#ifndef _WIN32_WCE
-  MessageBox(NULL, "Unable to open page"&url, PProcess::Current().GetName(), MB_TASKMODAL);
-#else
-  MessageBox(NULL, _T("Unable to open page"), PProcess::Current().GetName().AsUCS2(), MB_APPLMODAL);
-#endif // _WIN32_WCE
-
-#endif // WIN32
-  return PFalse;
-}
-
-
-void PURL::Recalculate()
-{
-  //if (scheme.IsEmpty())
-  //  scheme = SchemeTable[DEFAULT_SCHEME].name;
-  if (scheme.IsEmpty())
-    scheme = DEFAULT_SCHEME;
-
-  urlString = AsString(HostPortOnly) + AsString(URIOnly);
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
 // PHTTP
 
 static char const * const HTTPCommands[PHTTP::NumCommands] = {

Modified: ptlib/trunk/src/ptclib/httpform.cxx
===================================================================
--- ptlib/trunk/src/ptclib/httpform.cxx	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/src/ptclib/httpform.cxx	2008-01-07 11:22:04 UTC (rev 19210)
@@ -34,6 +34,9 @@
 
 #include <ptlib.h>
 #include <ptclib/httpform.h>
+
+#if P_HTTPFORMS
+
 #include <ptclib/cypher.h>
 
 
@@ -2228,5 +2231,6 @@
 }
 
 
+#endif // P_HTTPFORMS
 
 // End Of File ///////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptclib/modem.cxx
===================================================================
--- ptlib/trunk/src/ptclib/modem.cxx	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/src/ptclib/modem.cxx	2008-01-07 11:22:04 UTC (rev 19210)
@@ -55,10 +55,12 @@
 }
 
 
+#if P_CONFIG_FILE
 PModem::PModem(PConfig & cfg)
 {
   status = Open(cfg) ? Uninitialised : Unopened;
 }
+#endif // P_CONFIG_FILE
 
 
 void PModem::SetInitString(const PString & str)
@@ -166,6 +168,8 @@
 }
 
 
+#if P_CONFIG_FILE
+
 static const char ModemInit[] = "ModemInit";
 static const char ModemDeinit[] = "ModemDeinit";
 static const char ModemPreDial[] = "ModemPreDial";
@@ -206,6 +210,7 @@
   cfg.SetString(ModemConnect, connectReply);
   cfg.SetString(ModemHangUp, hangUpCmd);
 }
+#endif // P_CONFIG_FILE
 
 
 PBoolean PModem::CanInitialise() const

Modified: ptlib/trunk/src/ptclib/psoap.cxx
===================================================================
--- ptlib/trunk/src/ptclib/psoap.cxx	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/src/ptclib/psoap.cxx	2008-01-07 11:22:04 UTC (rev 19210)
@@ -36,7 +36,7 @@
 #include <ptlib.h>
 
 
-#if P_EXPAT
+#if P_SOAP
 
 #include <ptclib/psoap.h>
 
@@ -673,7 +673,7 @@
 }
 
 
-#endif // P_EXPAT
+#endif // P_SOAP
 
 
 // End of File ////////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptclib/pxml.cxx
===================================================================
--- ptlib/trunk/src/ptclib/pxml.cxx	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/src/ptclib/pxml.cxx	2008-01-07 11:22:04 UTC (rev 19210)
@@ -997,6 +997,8 @@
 {
 }
 
+
+#if P_CONFIG_FILE
 PXMLSettings::PXMLSettings(const PConfig & data, int options)
   : PXML(options) 
 {
@@ -1009,7 +1011,9 @@
     }
   }
 }
+#endif // P_CONFIG_FILE
 
+
 PBoolean PXMLSettings::Load(const PString & data)
 {
   return PXML::Load(data);
@@ -1072,6 +1076,8 @@
   return element->HasAttribute(key);
 }
 
+
+#if P_CONFIG_FILE
 void PXMLSettings::ToConfig(PConfig & cfg) const
 {
   for (PINDEX i = 0;i < (PINDEX)GetNumElements();++i) {
@@ -1085,7 +1091,9 @@
     }
   }
 }
+#endif // P_CONFIG_FILE
 
+
 ///////////////////////////////////////////////////////
 
 PXMLStreamParser::PXMLStreamParser()

Modified: ptlib/trunk/src/ptclib/pxmlrpc.cxx
===================================================================
--- ptlib/trunk/src/ptclib/pxmlrpc.cxx	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/src/ptclib/pxmlrpc.cxx	2008-01-07 11:22:04 UTC (rev 19210)
@@ -37,7 +37,7 @@
 #pragma implementation "pxmlrpc.h"
 #endif
 
-#if P_EXPAT
+#if P_XMLRPC
 
 #include <ptclib/pxmlrpc.h>
 
@@ -1229,7 +1229,7 @@
 }
 
 
-#endif 
+#endif // P_XMLRPC
 
 
 // End of file ///////////////////////////////////////////////////////////////

Modified: ptlib/trunk/src/ptclib/pxmlrpcs.cxx
===================================================================
--- ptlib/trunk/src/ptclib/pxmlrpcs.cxx	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/src/ptclib/pxmlrpcs.cxx	2008-01-07 11:22:04 UTC (rev 19210)
@@ -39,7 +39,7 @@
 
 #define   DEFAULT_XMPRPC_URL  "/RPC2"
 
-#if P_EXPAT
+#if P_XMLRPC
 
 #include <ptclib/pxmlrpcs.h>
 
@@ -207,5 +207,5 @@
   return reply;
 }
 
-#endif
+#endif // P_XMLRPC
 

Modified: ptlib/trunk/src/ptclib/socks.cxx
===================================================================
--- ptlib/trunk/src/ptclib/socks.cxx	2008-01-06 23:37:52 UTC (rev 19209)
+++ ptlib/trunk/src/ptclib/socks.cxx	2008-01-07 11:22:04 UTC (rev 19210)
@@ -61,6 +61,7 @@
   remotePort = port;
   localPort = 0;
 
+#if P_CONFIG_FILE
   // get proxy information
   PConfig config(PConfig::System, "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\");
 
@@ -80,6 +81,7 @@
       }
     }
   }
+#endif // P_CONFIG_FILE
 }
 
 

Added: ptlib/trunk/src/ptclib/url.cxx
===================================================================
--- ptlib/trunk/src/ptclib/url.cxx	                        (rev 0)
+++ ptlib/trunk/src/ptclib/url.cxx	2008-01-07 11:22:04 UTC (rev 19210)
@@ -0,0 +1,873 @@
+/*
+ * url.cxx
+ *
+ * URL parsing classes.
+ *
+ * Portable Tools Library
+ *
+ * Copyright (c) 1993-2008 Equivalence Pty. Ltd.
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Portable Windows Library.
+ *
+ * The Initial Developer of the Original Code is Equivalence Pty. Ltd.
+ *
+ * Contributor(s): ______________________________________.
+ *
+ * $Revision: 19008 $
+ * $Author: rjongbloed $
+ * $Date: 2007-11-29 20:17:41 +1100 (Thu, 29 Nov 2007) $
+ */
+
+#ifdef __GNUC__
+#pragma implementation "url.h"
+#endif
+
+#include <ptlib.h>
+
+#if P_URL
+
+#define P_DISABLE_FACTORY_INSTANCES
+#include <ptlib/pfactory.h>
+
+#include <ptclib/url.h>
+
+#include <ptlib/sockets.h>
+#include <ctype.h>
+
+#if defined(WIN32) && !defined(_WIN32_WCE)
+#include <shellapi.h>
+#pragma comment(lib,"shell32.lib")
+#endif
+
+
+// RFC 1738
+// http://host:port/path...
+// https://host:port/path....
+// gopher://host:port
+// wais://host:port
+// nntp://host:port
+// prospero://host:port
+// ftp://user:password@...>...
+// telnet://user:password@...>
+// file://hostname/path...
+
+// mailto:user@...
+// news:string
+
+#define DEFAULT_FTP_PORT      21
+#define DEFAULT_TELNET_PORT   23
+#define DEFAULT_GOPHER_PORT   70
+#define DEFAULT_HTTP_PORT     80
+#define DEFAULT_NNTP_PORT     119
+#define DEFAULT_WAIS_PORT     210
+#define DEFAULT_HTTPS_PORT    443
+#define DEFAULT_RTSP_PORT     554
+#define DEFAULT_RTSPU_PORT    554
+#define DEFAULT_PROSPERO_PORT 1525
+#define DEFAULT_H323_PORT     1720
+#define DEFAULT_H323S_PORT    1300
+#define DEFAU