rhodes 1.5.5 → 2.0.0.beta1

data/platform/wm/rhodes/menubar.cpp

@@ -4,38 +4,7 @@
 
 #include "resource.h"
 #include "menubar.h"
-
-/*
-void CODButtonImpl::DrawItem ( LPDRAWITEMSTRUCT lpdis )
-{
-	CDCHandle dc = lpdis->hDC;
-	CDC dcMem;
-
-    dcMem.CreateCompatibleDC ( dc );
-    dc.SaveDC();
-    dcMem.SaveDC();
-
-    // Draw the button's background, red if it has the focus, blue if not.
-	if ( lpdis->itemState & ODS_FOCUS ) {
-		dc.FillSolidRect ( &lpdis->rcItem, ::GetSysColor(COLOR_3DLIGHT) );
-		dc.Draw3dRect(&lpdis->rcItem, ::GetSysColor(COLOR_BTNHILIGHT), ::GetSysColor(COLOR_BTNSHADOW));
-	} else {
-		dc.FillSolidRect ( &lpdis->rcItem, ::GetSysColor(COLOR_3DLIGHT) );
-	}
-
-	// Draw the bitmap in the top-left, or offset by 1 pixel if the button
-    // is clicked.
-    //dcMem.SelectBitmap ( m_bmp );
-
-    //if ( lpdis->itemState & ODS_SELECTED ) 
-    //    dc.BitBlt ( 1, 1, 80, 80, dcMem, 0, 0, SRCCOPY );
-    //else
-    //    dc.BitBlt ( 0, 0, 80, 80, dcMem, 0, 0, SRCCOPY );
-
-    dcMem.RestoreDC(-1);
-    dc.RestoreDC(-1);
-}
-*/
+#include "common/RhodesApp.h"
 
 LRESULT CMenuBar::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
 //	m_btnLeft.Create(m_hWnd,CWindow::rcDefault,TEXT("Exit"),WS_CHILD|WS_VISIBLE|BS_OWNERDRAW,0,10);
@@ -74,7 +43,7 @@ LRESULT CMenuBar::OnEraseBkgnd(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/,
 
 LRESULT CMenuBar::OnBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
 {
-	::PostMessage(this->GetParent(),WM_COMMAND,IDM_BACK,0);
+    RHODESAPP().navigateBack();
     return 0;
 }
 

data/platform/wm/rhodes/menubar.h

@@ -1,20 +1,6 @@
 #pragma once
 
 #if !defined(_WIN32_WCE)
-/*
-class CODButtonImpl : public CWindowImpl<CODButtonImpl, CButton>,
-                      public COwnerDraw<CODButtonImpl>
-{
-public:
-    BEGIN_MSG_MAP_EX(CODButtonImpl)
-        CHAIN_MSG_MAP_ALT(COwnerDraw<CODButtonImpl>, 1)
-        DEFAULT_REFLECTION_HANDLER()
-    END_MSG_MAP()
- 
-    void DrawItem ( LPDRAWITEMSTRUCT lpdis );
-};
-*/
-
 #define IDB_BACK 10
 #define IDB_MENU 11
 

data/platform/wm/rhodes/resource.h

@@ -16,6 +16,9 @@
 #define IDR_LOGVIEW_MENU                115
 #define IDD_SIMULATOR_LOGOPTIONS        116
 #define IDI_ICON                        117
+#define IDD_DATETIME_PICKER             118
+#define IDD_DATEPICKER                  119
+#define IDD_TIME_PICKER                 119
 #define IDC_STATIC_PROMPT               1001
 #define IDC_EDIT_URL                    1002
 #define IDC_LOGEDIT                     1003
@@ -26,6 +29,10 @@
 #define IDC_EDIT2                       1007
 #define IDC_MSGEXCLUDE                  1007
 #define IDC_BUTTON2                     1010
+#define IDC_DATE_CTRL                   1012
+#define IDC_TIME_CTRL                   1013
+#define IDC_DATE_STATIC                 1017
+#define IDC_TIME_STATIC                 1019
 #define IDS_EXIT                        10001
 #define IDS_MENU                        10002
 #define IDS_OK                          10003
@@ -34,20 +41,13 @@
 #define IDM_SK1_EXIT                    40001
 #define IDM_SK2_MENU                    40002
 #define IDM_BACK                        40003
-#define IDM_FORWARD                     40004
-#define IDM_HOME                        40005
-#define IDM_OPENURL                     40006
+#define IDM_NAVIGATE_BACK               40005
 #define IDM_REFRESH                     40007
-#define IDM_STOP                        40008
 #define IDM_POPUP_MENU                  40009
 #define ID_SYNC                         40010
-#define IDM_SYNC                        40011
-#define ID__RELOADRHOBUNDLE             40012
-#define IDM_RELOADRHOBUNDLE             40013
 #define ID__OPTIONS                     40014
 #define IDM_OPTIONS                     40015
 #define ID_EXIT                         40016
-#define ID_MENU                         40017
 #define ID_MENU_HELLO                   40018
 #define IDM_EXIT                        40019
 #define IDM_LOG                         40020
@@ -58,14 +58,16 @@
 #define ID_MENU_SELECTALL               40025
 #define ID_MENU_FIND                    40026
 #define IDM_SENDLOG                     40027
+#define ID_Menu                         40028
+#define ID_FULLSCREEN                   40029
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         40028
-#define _APS_NEXT_CONTROL_VALUE         1010
+#define _APS_NEXT_RESOURCE_VALUE        120
+#define _APS_NEXT_COMMAND_VALUE         40030
+#define _APS_NEXT_CONTROL_VALUE         1020
 #define _APS_NEXT_SYMED_VALUE           111
 #endif
 #endif

data/platform/wm/rhodes/rho/net/NetRequest.cpp

@@ -3,6 +3,7 @@
 #include "NetRequest.h"
 #include "common/AutoPointer.h"
 #include "common/RhoFile.h"
+#include "common/RhoFilePath.h"
 #include "NetRequestImpl.h"
 #include "common/RhodesApp.h"
 
@@ -31,7 +32,7 @@ INetResponse* CNetRequest::pullCookies(const String& strUrl, const String& strBo
 
 INetResponse* CNetRequest::doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )
 {
-    CNetRequestImpl oImpl(this, method,strUrl,oSession,pHeaders);
+    CNetRequestImpl oImpl(this, method,strUrl,oSession,pHeaders, m_sslVerifyPeer);
     return oImpl.sendString(strBody);
 }
 
@@ -48,55 +49,35 @@ void CNetRequest::cancel()
         m_pCurNetRequestImpl->cancel();
 }
 
-INetResponse* CNetRequest::pushFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
+INetResponse* CNetRequest::pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
 {
-    common::CRhoFile oFile;
-    if ( !oFile.open(strFilePath.c_str(),common::CRhoFile::OpenReadOnly) ) 
-    {
-        LOG(ERROR) + "pushFile: cannot find file :" + strFilePath;
-        return new CNetResponseImpl();
-    }
-
-    int nTry = 0;
-    m_bCancel = false;
-    CNetResponseImpl* pResp = 0;
-    do
-    {
-        if ( pResp )
-            delete pResp;
+    CNetRequestImpl oImpl(this, "POST",strUrl,oSession,pHeaders,m_sslVerifyPeer);
+    CNetResponseImpl* pResp = oImpl.sendMultipartData(arItems);
+    return pResp;
+}
 
-        CNetRequestImpl oImpl(this, "POST",strUrl,oSession,pHeaders);
-        pResp = oImpl.sendStream(oFile.getInputStream());
-        nTry++;
+INetResponse* CNetRequest::pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
+{
+    VectorPtr<CMultipartItem*> arItems;
+    arItems.addElement(&oItem);
 
-    }while( !m_bCancel && !pResp->isResponseRecieved() && nTry < MAX_NETREQUEST_RETRY );
+    INetResponse* pResp = pushMultipartData(strUrl, arItems, oSession, pHeaders);
 
+    arItems[0] = 0; //do not delete item
     return pResp;
 }
 
 INetResponse* CNetRequest::pullFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
 {
     common::CRhoFile oFile;
-    if ( !oFile.open(strFilePath.c_str(),common::CRhoFile::OpenForWrite) ) 
+    if ( !oFile.open(strFilePath.c_str(),common::CRhoFile::OpenForAppend) ) 
     {
         LOG(ERROR) + "pullFile: cannot create file :" + strFilePath;
         return new CNetResponseImpl();
     }
 
-    int nTry = 0;
-    m_bCancel = false;
-    CNetResponseImpl* pResp = 0;
-    do
-    {
-        if ( pResp )
-            delete pResp;
-
-        CNetRequestImpl oImpl(this, "GET",strUrl,oSession,pHeaders);
-        pResp = oImpl.downloadFile(oFile);
-        nTry++;
-
-    }while( !m_bCancel && !pResp->isResponseRecieved() && nTry < MAX_NETREQUEST_RETRY );
-
+    CNetRequestImpl oImpl(this, "GET",strUrl,oSession,pHeaders,m_sslVerifyPeer);
+    CNetResponseImpl* pResp = oImpl.downloadFile(oFile);
     return pResp;
 }
 

data/platform/wm/rhodes/rho/net/NetRequest.h

@@ -10,20 +10,26 @@ class CNetRequest : public INetRequest
 {
     DEFINE_LOGCLASS;
     boolean m_bCancel;
+    boolean m_sslVerifyPeer;
 public:
     CNetRequestImpl* m_pCurNetRequestImpl;
 
-    CNetRequest(void) : m_pCurNetRequestImpl(null), m_bCancel(false){}
+    CNetRequest(void) : m_pCurNetRequestImpl(null), m_bCancel(false), m_sslVerifyPeer(true) {}
     virtual ~CNetRequest(void){}
 
     virtual INetResponse* pullData(const String& strUrl, IRhoSession* oSession );
     virtual INetResponse* pushData(const String& strUrl, const String& strBody, IRhoSession* oSession);
-    virtual INetResponse* pushFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+    virtual INetResponse* pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+    virtual INetResponse* pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+
     virtual INetResponse* pullFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
     virtual INetResponse* pullCookies(const String& strUrl, const String& strBody, IRhoSession* oSession);
 
     virtual INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders );
 
+    virtual boolean sslVerifyPeer() {return m_sslVerifyPeer;}
+    virtual void sslVerifyPeer(boolean mode) {m_sslVerifyPeer = mode;}
+
     virtual String resolveUrl(const String& strUrl);
 
     virtual void cancel();

data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp

@@ -2,6 +2,7 @@
 
 #include "NetRequestImpl.h"
 #include "common/RhoFile.h"
+#include "common/RhoFilePath.h"
 #include "NetRequest.h"
 #include "common/StringConverter.h"
 #include "net/URI.h"
@@ -18,13 +19,15 @@ namespace rho {
 namespace net {
 IMPLEMENT_LOGCLASS(CNetRequestImpl,"Net");
 
-CNetRequestImpl::CNetRequestImpl(CNetRequest* pParent, const char* method, const String& strUrl, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
+CNetRequestImpl::CNetRequestImpl(CNetRequest* pParent, const char* method, const String& strUrl, 
+    IRhoSession* oSession, Hashtable<String,String>* pHeaders, boolean sslVerifyPeer)
 {
     m_pParent = pParent;
     m_pParent->m_pCurNetRequestImpl = this;
     m_pHeaders = pHeaders;
     m_bCancel = false;
     m_pSession = oSession;
+    m_sslVerifyPeer = sslVerifyPeer;
 
     pszErrFunction = NULL;
     hInet = NULL, hConnection = NULL, hRequest = NULL;
@@ -78,6 +81,9 @@ CNetRequestImpl::CNetRequestImpl(CNetRequest* pParent, const char* method, const
         if ( uri.lpszScheme && wcsicmp(uri.lpszScheme,L"https")==0)
             dwFlags |= INTERNET_FLAG_SECURE;
 
+        if ( !m_sslVerifyPeer )
+            dwFlags |= INTERNET_FLAG_IGNORE_CERT_CN_INVALID|INTERNET_FLAG_IGNORE_CERT_DATE_INVALID;
+
         hRequest = HttpOpenRequest( hConnection, CAtlStringW(method), strReqUrlW, NULL, NULL, NULL, dwFlags, NULL );
         if ( !hRequest ) 
         {
@@ -101,6 +107,46 @@ CNetRequestImpl::CNetRequestImpl(CNetRequest* pParent, const char* method, const
     }while(0);
 }
 
+boolean CNetRequestImpl::checkSslCertError()
+{
+    DWORD dwError = GetLastError ();
+    if (!m_sslVerifyPeer &&(
+        (dwError == ERROR_INTERNET_INVALID_CA) ||
+        (dwError == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED) ||
+        (dwError == ERROR_INTERNET_SEC_CERT_DATE_INVALID) ||
+        (dwError == ERROR_INTERNET_SEC_CERT_CN_INVALID)))
+    {
+        DWORD dwFlag;
+        DWORD dwBuffLen = sizeof(dwFlag);
+        InternetQueryOption (hRequest, INTERNET_OPTION_SECURITY_FLAGS,(LPVOID)&dwFlag, &dwBuffLen);
+        dwFlag |= (SECURITY_FLAG_IGNORE_UNKNOWN_CA
+            | SECURITY_FLAG_IGNORE_CERT_CN_INVALID
+            | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID );
+        InternetSetOption (hRequest, INTERNET_OPTION_SECURITY_FLAGS, &dwFlag, sizeof (dwFlag) );
+        /*
+        INTERNET_CERTIFICATE_INFO sInfo;
+        DWORD dwSize = sizeof(sInfo);
+        if(!InternetQueryOption(m_hSess,INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT,
+            &sInfo, &dwSize))
+        {
+            dwError = GetLastError();
+        }
+        */
+
+        return true;
+    }
+
+    return false;
+}
+
+String CNetRequestImpl::getBodyContentType()
+{
+    if ( m_pSession )
+        return m_pSession->getContentType();
+    else
+        return "application/x-www-form-urlencoded";
+}
+
 CNetResponseImpl* CNetRequestImpl::sendString(const String& strBody)
 {
     CNetResponseImpl* pNetResp = new CNetResponseImpl;
@@ -110,9 +156,12 @@ CNetResponseImpl* CNetRequestImpl::sendString(const String& strBody)
         if ( isError() )
             break;
 
-        if ( strBody.length() > 0 )
+        if ( strBody.length() > 0  )
         {
-            CAtlStringW strHeaders = L"Content-Type: application/x-www-form-urlencoded\r\n";
+            CAtlStringW strHeaders = L"Content-Type: ";
+            strHeaders += getBodyContentType().c_str();
+            strHeaders += L"\r\n";
+
             if ( !HttpAddRequestHeaders( hRequest, strHeaders, -1, HTTP_ADDREQ_FLAG_ADD|HTTP_ADDREQ_FLAG_REPLACE ) )
             {
                 pszErrFunction = L"HttpAddRequestHeaders";
@@ -123,8 +172,18 @@ CNetResponseImpl* CNetRequestImpl::sendString(const String& strBody)
 
         if ( !HttpSendRequest( hRequest, NULL, 0, const_cast<char*>(strBody.c_str()), strBody.length() ) )
         {
-            pszErrFunction = L"HttpSendRequest";
-            break;
+            if (checkSslCertError())
+            {
+                if ( !HttpSendRequest( hRequest, NULL, 0, const_cast<char*>(strBody.c_str()), strBody.length() ) )
+                {
+                    pszErrFunction = L"HttpSendRequest";
+                    break;
+                }
+            }else
+            {
+                pszErrFunction = L"HttpSendRequest";
+                break;
+            }
         }
 
         readResponse(pNetResp);
@@ -255,7 +314,7 @@ void CNetRequestImpl::readResponse(CNetResponseImpl* pNetResp)
             return;
     }
 
-    if ( nCode != 200 )
+    if ( nCode != 200 && nCode != 206 && nCode != 416 )
     {
         LOG(ERROR) + "An error occured connecting to the sync source: " + szHttpRes + " returned.";
 
@@ -274,6 +333,8 @@ void CNetRequestImpl::readResponse(CNetResponseImpl* pNetResp)
 CNetResponseImpl* CNetRequestImpl::downloadFile(common::CRhoFile& oFile)
 {
     CNetResponseImpl* pNetResp = new CNetResponseImpl;
+    const int nDownloadBufferSize = 1024*50;
+    char* pDownloadBuffer = 0;
 
     do
     {
@@ -282,34 +343,122 @@ CNetResponseImpl* CNetRequestImpl::downloadFile(common::CRhoFile& oFile)
         if ( isError() )
             break;
 
+        //if ( oFile.size() > 0 )
+        {
+            CAtlStringW strHeaders = L"Range: bytes=";
+            strHeaders += common::convertToStringW(oFile.size()).c_str();
+            strHeaders += L"-";
+            //strHeaders += common::convertToStringW(oFile.size()+30068032).c_str();
+            strHeaders += "\r\n";
+
+            if ( !HttpAddRequestHeaders( hRequest, strHeaders, -1, HTTP_ADDREQ_FLAG_ADD|HTTP_ADDREQ_FLAG_REPLACE ) )
+            {
+                pszErrFunction = L"HttpAddRequestHeaders";
+                break;
+            }
+        }
+
         if ( !HttpSendRequest( hRequest, NULL, 0, NULL, 0 ) )
         {
-            pszErrFunction = L"HttpSendRequest";
-            break;
+            if (checkSslCertError())
+            {
+                if ( !HttpSendRequest( hRequest, NULL, 0, NULL, 0 ) )
+                {
+                    pszErrFunction = L"HttpSendRequest";
+                    break;
+                }
+            }else
+            {
+                pszErrFunction = L"HttpSendRequest";
+                break;
+            }
         }
 
         readResponse(pNetResp);
         if ( isError() )
             break;
 
-        readInetFile(hRequest,pNetResp, &oFile);
+        if ( pNetResp->getRespCode() == 416 )
+        {
+            pNetResp->setResponseCode(206);
+            break;
+        }
+
+        if (!pDownloadBuffer)
+            pDownloadBuffer = new char[nDownloadBufferSize];
+
+        readInetFile(hRequest,pNetResp, &oFile, pDownloadBuffer, nDownloadBufferSize);
 
     }while(0);
 
+    if (pDownloadBuffer)
+        delete pDownloadBuffer;
+
     return pNetResp;
 }
 
-static const char* szMultipartPrefix = 
-   "------------A6174410D6AD474183FDE48F5662FCC5\r\n"
-   "Content-Disposition: form-data; name=\"blob\"; filename=\"doesnotmatter.png\"\r\n"
-   "Content-Type: application/octet-stream\r\n\r\n";
+static const wchar_t* szMultipartContType = 
+    L"Content-Type: multipart/form-data; boundary=----------A6174410D6AD474183FDE48F5662FCC5\r\n";
 static const char* szMultipartPostfix = 
     "\r\n------------A6174410D6AD474183FDE48F5662FCC5--";
 
-static const wchar_t* szMultipartContType = 
-    L"Content-Type: multipart/form-data; boundary=----------A6174410D6AD474183FDE48F5662FCC5\r\n";
+int CNetRequestImpl::processMultipartItems( VectorPtr<CMultipartItem*>& arItems )
+{
+    int nSize = 0;
+    for( int i = 0; i < (int)arItems.size(); i++ )
+    {
+        CMultipartItem& oItem = *arItems.elementAt(i); 
+
+        if ( oItem.m_strName.length() == 0 )
+            oItem.m_strName = "blob";
+
+        if ( oItem.m_strFileName.length() == 0 )
+        {
+            if ( oItem.m_strFilePath.length() > 0 )
+            {
+                common::CFilePath oPath(oItem.m_strFilePath);
+                oItem.m_strFileName = oPath.getBaseName();
+            }
+            //else
+            //    oItem.m_strFileName = "doesnotmatter.txt";
+        }
+
+        oItem.m_strDataPrefix = i > 0 ? "\r\n" : "";
+        oItem.m_strDataPrefix += 
+            "------------A6174410D6AD474183FDE48F5662FCC5\r\n"
+            "Content-Disposition: form-data; name=\"";
+        oItem.m_strDataPrefix += oItem.m_strName + "\"";
+        if (oItem.m_strFileName.length()>0)
+            oItem.m_strDataPrefix += "; filename=\"" + oItem.m_strFileName + "\"";
+        oItem.m_strDataPrefix += "\r\n";
+        if ( oItem.m_strContentType.length() > 0 )
+            oItem.m_strDataPrefix += "Content-Type: " + oItem.m_strContentType + "\r\n";
+
+        int nContentSize = 0;
+        if ( oItem.m_strFilePath.length() > 0 )
+        {
+            common::CRhoFile oFile;
+            if ( oFile.open(oItem.m_strFilePath.c_str(),common::CRhoFile::OpenReadOnly) ) 
+                nContentSize = oFile.size();
+        }
+        else
+            nContentSize = oItem.m_strBody.length();
 
-CNetResponseImpl* CNetRequestImpl::sendStream(common::InputStream* bodyStream)
+        if ( oItem.m_strContentType.length() > 0 )
+            oItem.m_strDataPrefix += "Content-Length: " + common::convertToStringA(nContentSize) + "\r\n";
+
+        oItem.m_strDataPrefix += "\r\n";
+
+        nSize += oItem.m_strDataPrefix.length() + nContentSize;
+
+    }
+
+    nSize += strlen(szMultipartPostfix);
+
+    return nSize;
+}
+
+CNetResponseImpl* CNetRequestImpl::sendMultipartData(VectorPtr<CMultipartItem*>& arItems)
 {
     CNetResponseImpl* pNetResp = new CNetResponseImpl;
 
@@ -329,44 +478,83 @@ CNetResponseImpl* CNetRequestImpl::sendStream(common::InputStream* bodyStream)
 	    INTERNET_BUFFERS BufferIn;
         memset(&BufferIn, 0, sizeof(INTERNET_BUFFERS));
 	    BufferIn.dwStructSize = sizeof( INTERNET_BUFFERS ); // Must be set or error will occur
-        BufferIn.dwBufferTotal = bodyStream->available() + strlen(szMultipartPrefix) + strlen(szMultipartPostfix);
+        BufferIn.dwBufferTotal = processMultipartItems( arItems );
 
         if(!HttpSendRequestEx( hRequest, &BufferIn, NULL, 0, 0))
         {
-            pszErrFunction = L"HttpSendRequestEx";
-            break;
+            if (checkSslCertError())
+            {
+                if(!HttpSendRequestEx( hRequest, &BufferIn, NULL, 0, 0))
+                {
+                    pszErrFunction = L"HttpSendRequestEx";
+                    break;
+                }
+            }else
+            {
+                pszErrFunction = L"HttpSendRequestEx";
+                break;
+            }
         }
 
-	    DWORD dwBytesWritten = 0;
-        if ( !InternetWriteFile( hRequest, szMultipartPrefix, strlen(szMultipartPrefix), &dwBytesWritten) )
+        //write all items
+        for( int i = 0; i < (int)arItems.size(); i++ )
         {
-            pszErrFunction = L"InternetWriteFile";
-            break;
-        }
+            CMultipartItem& oItem = *arItems.elementAt(i); 
 
-        DWORD dwBufSize = 4096;
-        char* pBuf = (char*)malloc(dwBufSize);
-        int nReaded = 0;
+            if ( oItem.m_strFilePath.length() > 0 )
+            {
+                common::CRhoFile oFile;
+                if ( !oFile.open(oItem.m_strFilePath.c_str(),common::CRhoFile::OpenReadOnly) ) 
+                {
+                    pszErrFunction = L"InternetWriteFile";
+                    return pNetResp;
+                }
+                common::InputStream* bodyStream = oFile.getInputStream();
+
+                if ( !internetWriteHeader( oItem.m_strDataPrefix.c_str(), "", "") )
+                {
+                    pszErrFunction = L"InternetWriteFile";
+                    return pNetResp;
+                }
 
-	    do
-	    {
-            nReaded = bodyStream->read(pBuf,0,dwBufSize);
-            if ( nReaded > 0 )
+                DWORD dwBytesWritten = 0;
+                if ( bodyStream->available() > 0 )
+                {
+                    DWORD dwBufSize = 4096;
+                    char* pBuf = (char*)malloc(dwBufSize);
+                    int nReaded = 0;
+
+	                do
+	                {
+                        nReaded = bodyStream->read(pBuf,0,dwBufSize);
+                        if ( nReaded > 0 )
+                        {
+		                    if ( !InternetWriteFile( hRequest, pBuf, nReaded, &dwBytesWritten) )
+                            {
+                                pszErrFunction = L"InternetWriteFile";
+                                return pNetResp;
+                            }
+                        }
+	                }while(nReaded > 0);
+
+                    free(pBuf);
+                }
+
+            }else
             {
-		        if ( !InternetWriteFile( hRequest, pBuf, nReaded, &dwBytesWritten) )
+                if ( !internetWriteHeader( oItem.m_strDataPrefix.c_str(), oItem.m_strBody.c_str(), "") )
                 {
                     pszErrFunction = L"InternetWriteFile";
-                    break;
+                    return pNetResp;
                 }
             }
-	    }while(nReaded > 0);
 
-        free(pBuf);
+        }
 
-        if ( !InternetWriteFile( hRequest, szMultipartPostfix, strlen(szMultipartPostfix), &dwBytesWritten) )
+        if ( !internetWriteHeader( "", "", szMultipartPostfix) )
         {
             pszErrFunction = L"InternetWriteFile";
-            break;
+            return pNetResp;
         }
 
         if ( !HttpEndRequest(hRequest, NULL, 0, 0) )
@@ -389,6 +577,21 @@ CNetResponseImpl* CNetRequestImpl::sendStream(common::InputStream* bodyStream)
     return pNetResp;
 }
 
+bool CNetRequestImpl::internetWriteHeader( const char* szPrefix, const char* szBody, const char* szPrefixEnd)
+{
+    DWORD dwBytesWritten = 0;
+    if ( szPrefix && *szPrefix && !InternetWriteFile( hRequest, szPrefix, strlen(szPrefix), &dwBytesWritten) )
+        return false;
+
+    if ( szBody && *szBody && !InternetWriteFile( hRequest, szBody, strlen(szBody), &dwBytesWritten) )
+        return false;
+
+    if ( szPrefixEnd && *szPrefixEnd && !InternetWriteFile( hRequest, szPrefixEnd, strlen(szPrefixEnd), &dwBytesWritten) )
+        return false;
+
+    return true;
+}
+
 void CNetRequestImpl::cancel()
 {
     m_bCancel = true;
@@ -432,13 +635,24 @@ CNetRequestImpl::~CNetRequestImpl()
     m_pParent->m_pCurNetRequestImpl = null;
 }
 
-void CNetRequestImpl::readInetFile( HINTERNET hRequest, CNetResponseImpl* pNetResp, common::CRhoFile* pFile /*=NULL*/ )
+void CNetRequestImpl::readInetFile( HINTERNET hRequest, CNetResponseImpl* pNetResp, common::CRhoFile* pFile /*=NULL*/,
+    char* pBuf, DWORD dwBufSize )
 {
     //if ( pNetResp->getRespCode() == 500 || pNetResp->getRespCode() == 422 )
     //    return;
+    char* pBufToFree = 0;
+    if (!pBuf)
+    {
+        if ( dwBufSize==0)
+            dwBufSize=1024*4;
+
+        pBuf = (char*)malloc(dwBufSize);
+        pBufToFree = pBuf;
+    }
 
-    DWORD dwBufSize = 4096;
-    char* pBuf = (char*)malloc(dwBufSize);
+    //DWORD dwBufSize = 1024*100;
+    //char* pBuf = (char*)malloc(dwBufSize);
+    //char* pBufToFree = pBuf;
     DWORD dwBytesRead = 0;
     BOOL bRead = FALSE;
     do
@@ -447,6 +661,7 @@ void CNetRequestImpl::readInetFile( HINTERNET hRequest, CNetResponseImpl* pNetRe
         if ( !bRead )
         {
             pszErrFunction = L"InternetReadFile";
+            pNetResp->setResponseCode(408);
             break;
         }
 
@@ -465,7 +680,8 @@ void CNetRequestImpl::readInetFile( HINTERNET hRequest, CNetResponseImpl* pNetRe
     if ( !pNetResp->isOK() )
         LOG(TRACE) + "Server response: " + pNetResp->getCharData();
 
-    free(pBuf);
+    if ( pBufToFree )
+        free(pBufToFree);
 }
 
 void CNetRequestImpl::ErrorMessage(LPCTSTR pszFunction)
@@ -485,7 +701,7 @@ void CNetRequestImpl::ErrorMessage(LPCTSTR pszFunction)
         (LPTSTR)&pszMessage,
         0, NULL );
 
-    CAtlStringW strExtError = L"";
+    wchar_t* szExtError = 0;
     if ( dwLastError == ERROR_INTERNET_EXTENDED_ERROR )
     {
         DWORD  dwInetError =0, dwExtLength = 0;
@@ -493,8 +709,8 @@ void CNetRequestImpl::ErrorMessage(LPCTSTR pszFunction)
 
         if ( dwExtLength > 0 )
         {
-            InternetGetLastResponseInfo( &dwInetError, strExtError.GetBuffer(dwExtLength+1), &dwExtLength );
-            strExtError.ReleaseBuffer();
+            szExtError = (wchar_t*)malloc(sizeof(wchar_t)*(dwExtLength+1));
+            InternetGetLastResponseInfo( &dwInetError, szExtError, &dwExtLength );
         }
     }
 
@@ -503,9 +719,11 @@ void CNetRequestImpl::ErrorMessage(LPCTSTR pszFunction)
 
     if ( pszMessage ) 
         oLogMsg + ".Message: " + pszMessage;
-    if ( strExtError.GetLength() )
-        oLogMsg + ".Extended info: " + strExtError.GetString();
+    if ( szExtError && *szExtError )
+        oLogMsg + ".Extended info: " + szExtError;
 
+    if ( szExtError )
+        free(szExtError);
     if ( pszMessage )
         LocalFree(pszMessage);
 }