rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/wm/rhodes/AppManager.cpp

@@ -10,6 +10,9 @@
 #include "unzip/unzip.h"
 #include "ext/rho/rhoruby.h"
 #include "common/AutoPointer.h"
+#include "common/StringConverter.h"
+
+using namespace rho::common;
 
 extern "C" wchar_t* wce_mbtowc(const char* a);
 
@@ -21,24 +24,65 @@ CAppManager::~CAppManager(void)
 {
 }
 
-bool CAppManager::RemoveFolder(LPCTSTR szPath) {
+bool CAppManager::RemoveFolder(String pathname)
+{
+	if (pathname.length() > 0) {
+		LPWSTR  swPath = wce_mbtowc(pathname.c_str());
+		TCHAR name[MAX_PATH+2];
+		wsprintf(name, L"%s%c", swPath, '\0');
 
-	if (szPath) {
 		SHFILEOPSTRUCT fop;
-		
+
 		fop.hwnd = NULL;
 		fop.wFunc = FO_DELETE;		
-		fop.pFrom = szPath;
+		fop.pFrom = name;
 		fop.pTo = NULL;
 		fop.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_NOCONFIRMMKDIR;
+		int result = SHFileOperation(&fop);
+
+		if (swPath)
+			free (swPath);
+
+		return result == 0;
+	}
+	return false;
+}
+
+bool CAppManager::MoveFolder(const String& pathFrom, const String &pathTo)
+{
+	if (pathFrom.length() > 0 && pathTo.length() > 0) {
+		
+		LPWSTR  swPathFrom = wce_mbtowc(pathFrom.c_str());
+		LPWSTR  swPathTo   = wce_mbtowc(pathTo.c_str());
+
+		TCHAR tcPathFrom[MAX_PATH+2];
+		TCHAR tcPathTo[MAX_PATH+2];
+
+		wsprintf(tcPathFrom, L"%s%c", swPathFrom,'\0');
+		wsprintf(tcPathTo, L"%s%c", swPathTo,'\0');
+
+		SHFILEOPSTRUCT fop;
+		
+		fop.hwnd = NULL;
+		fop.wFunc = FO_MOVE;
+		fop.pFrom = tcPathFrom;
+		fop.pTo   = tcPathTo;
+		fop.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_NOCONFIRMMKDIR;
 		
 		int result = SHFileOperation(&fop);
+
+		if (swPathFrom)
+			free (swPathFrom);
+		if (swPathTo)
+			free (swPathTo);
+
 		return result == 0;
 	}
 	return false;
 }
 
-bool CAppManager::RestartClient(HWND hwnd) {
+bool CAppManager::RestartClient(HWND hwnd) 
+{
 	TCHAR module[MAX_PATH];
 	GetModuleFileName(NULL,module,MAX_PATH);
 	HINSTANCE res = ShellExecute(hwnd, L"open", module, L"-restarting", NULL, SW_SHOWNORMAL);
@@ -46,84 +90,180 @@ bool CAppManager::RestartClient(HWND hwnd) {
 }
 
 void CAppManager::ReloadRhoBundle(HWND hwnd, const char* szUrl, const char* szZipPassword)
+{	
+	const char  *tmp_dir_name = "_tmp_";
+	const char	*loadData = NULL;
+	unsigned int loadSize = 0;
+	String		 root_dir = rho_native_rhopath();
+	String		 tmp_unzip_dir;
+	int          errCode = RRB_UNKNOWN_ERR;
+
+	root_dir.at(root_dir.length()-1) = '\\';
+	tmp_unzip_dir = root_dir + tmp_dir_name;
+
+	if (szUrl == NULL) {
+		LOG(ERROR) + "null url passed to ReloadRhoBundle";
+		return;
+	}
+
+	//trying to load file
+	rho::net::CNetRequest request;
+	//NB: for mobile devices should use filesystem instead of RAM
+	NetResponse (resp, request.pullData(szUrl, null));
+	if (resp.getDataSize() > 0 && resp.getCharData()) {
+		loadData = resp.getCharData();
+		loadSize = resp.getDataSize();
+		errCode = RRB_NONE_ERR;
+	} else {
+		errCode = RRB_LOADING_ERR;
+	}
+
+	//trying to unzip loaded file
+	if (errCode == RRB_NONE_ERR)
+		errCode = unzipRhoBundle(loadData, loadSize, szZipPassword, tmp_unzip_dir);
+	
+	RHODESAPP().stopApp();
+
+	//trying to delete old rhobundle
+	if (errCode == RRB_NONE_ERR)
+		errCode = removeOldRhoBundle();
+
+	//move new rhobundle from temporary dir
+	if (errCode == RRB_NONE_ERR) {
+		errCode = updateRhoBundle (root_dir, tmp_unzip_dir);
+	}
+
+	showMessage(hwnd, errCode);
+}
+
+int CAppManager::unzipRhoBundle (const char *zipData, unsigned int zipDataSize, const char *zipPassword, const String &targetPath)
 {
-	if ( szUrl )
-	{
-		//get zip file with rhodes
-		//DWORD dwDataSize = 0;
-        rho::net::CNetRequest request;
-        NetResponse(resp, request.pullData(szUrl, null));
-        DWORD dwDataSize = resp.getDataSize();
-		//char* zipData = request.doRequest( L"GET",const_cast<char*>(szUrl),NULL,0,NULL,0,false,true,false,&dwDataSize);
-        const char* zipData = resp.getCharData();
-		if ( zipData && dwDataSize > 0 )
-		{
-			LPWSTR rootw = wce_mbtowc(rho_native_rhopath());
-			rootw[wcslen(rootw)-1] = '\\';
-			bool ret = false;
-			if (wcslen(rootw)<MAX_PATH) {
-				TCHAR name[MAX_PATH+2];
-				wsprintf(name,L"%sapps%c",rootw,'\0');
-				if( RemoveFolder(name) ) {
-					wsprintf(name,L"%slib%c",rootw,'\0');
-
-					ret = RemoveFolder(name);
-				}
+	int err_code = RRB_NONE_ERR;
+	HANDLE hFind = 0;
+
+	HZIP   hz = OpenZip((void *)zipData, zipDataSize, zipPassword);
+	if (!hz) {
+		LOG(ERROR) + "Failed to open zipfile";
+		err_code = RRB_UNZIP_ERR;
+	}
+
+	if (err_code == RRB_NONE_ERR) {
+		//check for target dir
+		WIN32_FIND_DATA wfd;
+		hFind = FindFirstFile(convertToStringW(targetPath).c_str(), &wfd);
+		if (INVALID_HANDLE_VALUE == hFind) {
+			if (CreateDirectory(convertToStringW(targetPath).c_str(), NULL) != TRUE) {
+				LOG(ERROR) + "Failed to create temporary dir";
+				err_code = RRB_UNZIP_ERR;
 			}
+		} else {
+			LOG(WARNING) + "Temporary dir exists";
+			if (!RemoveFolder (targetPath)) {
+				LOG(ERROR) + "Failed to delete old temporary dir";
+				err_code = RRB_UNZIP_ERR;
+			}
+		}
+	}
 
-			//TODO: Add error handling to unzip code
-			if( ret ) {
-				ZIPENTRY ze; 
-				// Open zip file
-				HZIP hz = OpenZip(const_cast<char*>(zipData), dwDataSize, szZipPassword);
-			
-				if ( hz ) {
-					//Stop HTTP Server
-					RHODESAPP().stopApp();
-
-					// Set base for unziping
-					SetUnzipBaseDir(hz, rootw);
-				
-					// Get info about the zip
-					// -1 gives overall information about the zipfile
-					GetZipItem(hz,-1,&ze);
-					int numitems = ze.index;
-				
-					// Iterate through items and unzip them
-					for (int zi = 0; zi<numitems; zi++)
-					{ 
-						// fetch individual details, e.g. the item's name.
-						GetZipItem(hz,zi,&ze); 
-						// unzip item
-						UnzipItem(hz, zi, ze.name);         
-					}
-				
-					CloseZip(hz);
+	if (err_code == RRB_NONE_ERR) {
+		// Set base for unziping
+		SetUnzipBaseDir(hz, convertToStringW(targetPath).c_str());
 					
-					//Show MessageBox
-					MessageBox(hwnd, _T("Rhobundle has been updated successfully.\nApplication will be restarted."), _T("Information"), MB_OK | MB_ICONINFORMATION );
-					//Restart client
-					RestartClient(hwnd); 
-					//Close main window and client
-					::PostMessage(hwnd,WM_CLOSE,0,0);
-				} else {
-					MessageBox(hwnd, _T("Can't unzip loaded rhobundle."), _T("Stop"), MB_OK | MB_ICONSTOP );
-				}
-			} else {
-				MessageBox(hwnd, _T("Can't remove old version of rhobundle. However, it may be corrupted. Exit application and reinstall rhobundle manualy."), _T("Stop"), MB_OK | MB_ICONSTOP );
+		// Get info about the zip
+		// -1 gives overall information about the zipfile
+		ZIPENTRY ze;
+		GetZipItem(hz,-1, &ze);
+		int numitems = ze.index;
+					
+		// Iterate through items and unzip them
+		for (int zi = 0; zi<numitems; zi++) { 
+			// fetch individual details, e.g. the item's name.
+			if (ZR_OK != GetZipItem(hz,zi,&ze)) {
+				LOG(ERROR) + "Failed to unzip item";
+				RemoveFolder (targetPath);
+				err_code = RRB_UNZIP_ERR;
+				break;
 			}
+			UnzipItem(hz, zi, ze.name);
+		}
+	}
 
-			if ( rootw )
-				free(rootw);
+	if (hz)
+		CloseZip(hz);
 
-		} else {
-			MessageBox(hwnd, _T("Error loading rhobundle."), _T("Stop"), MB_OK | MB_ICONSTOP );
+	return err_code;
+}
+
+int CAppManager::removeOldRhoBundle (void)
+{
+	String root = rho_native_rhopath();
+	root.at(root.length()-1) = '\\';
+
+	if (!RemoveFolder(root + "apps")) {
+		LOG(ERROR) + "Failed to remove" + "\"" + (root + "apps") + "\"";
+		return RRB_REMOVEOLD_ERR;
+	}
+
+	if (!RemoveFolder(root + "lib")) {
+		LOG(ERROR) + "Failed to remove" + "\"" + (root + "lib	") + "\"";
+		return RRB_REMOVEOLD_ERR;
+	}
+	
+	return RRB_NONE_ERR;
+}
+
+
+int CAppManager::updateRhoBundle (const String &root_path, const String &from_path)
+{
+	int err_code = RRB_NONE_ERR;
+
+	if (!MoveFolder (from_path + "\\*.*", root_path)) {
+		LOG(ERROR) + "Failed to move new rhobundle content";
+		err_code = RRB_UPDATE_ERR;
+	}
+
+	if (err_code == RRB_NONE_ERR) {
+		if (!RemoveFolder (from_path)) {
+			LOG(ERROR) + "Failed to remove temporary dir";
 		}
+	}
+
+	return err_code;
+}
+
+void CAppManager::showMessage(HWND hWnd, int rrbErrCode) 
+{
+	String messageText;
+
+	if (rrbErrCode == RRB_NONE_ERR) {
+		MessageBox(hWnd, 
+					_T("Rhobundle has been updated successfully.\nApplication will be restarted."), 
+					_T("Information"), 
+					MB_OK | MB_ICONINFORMATION );
+		RestartClient(hWnd); 
+		//Close main window and client
+		::PostMessage(hWnd,WM_CLOSE,0,0);
+	}
 
-//		if ( zipData )
-//			free( zipData );
+	switch (rrbErrCode) {
+	case RRB_LOADING_ERR:
+		messageText = "Error loading rhobundle.";
+		break;
+	case RRB_UNZIP_ERR:
+		messageText= "Can't unzip loaded rhobundle.";
+		break;
+	case RRB_REMOVEOLD_ERR:
+		messageText = "Can't remove old version of rhobundle. However, it may be corrupted. Exit application and reinstall rhobundle manualy.";
+		break;
+	case RRB_UPDATE_ERR:
+		messageText= "Error updating rhobundle. Exit application and reinstall rhobundle manualy.";
+		break;
+	default:
+		messageText = "Error reloading rhobundle.";
+		break;
 	}
 
+	MessageBox(hWnd, convertToStringW(messageText).c_str(), _T("Stop"), MB_OK | MB_ICONSTOP );
 }
 
 #endif

data/platform/wm/rhodes/AppManager.h

@@ -1,19 +1,40 @@
 #pragma once
 
+#include "common/RhoStd.h"
+
+using namespace rho;
+
 #ifdef ENABLE_DYNAMIC_RHOBUNDLE
 class CAppManager
 {
+	enum {
+		RRB_NONE_ERR,
+		RRB_LOADING_ERR,
+		RRB_UNZIP_ERR,
+		RRB_REMOVEOLD_ERR,
+		RRB_UPDATE_ERR,
+		RRB_UNKNOWN_ERR
+	};
+
 public:
-	CAppManager(void);
-	~CAppManager(void);
+	CAppManager  (void);
+	~CAppManager (void);
 
 	/**
 	 * @param szUrl - url of the zip file with rhobundle
 	 * @param szZipPassword - zip password if required
 	 */
 	static void ReloadRhoBundle(HWND hwnd, const char* szUrl, const char* szZipPassword);
-	static bool RemoveFolder(LPCTSTR szPath);
+	static bool RemoveFolder(String pathname);
+	static bool MoveFolder(const String& pathFrom, const String &pathTo);
 	static bool RestartClient(HWND hwnd);
+
+private:
+
+	static int unzipRhoBundle (const char *zipData, unsigned int zipDataSize, const char *zipPassword, const String &targetPath);
+	static int removeOldRhoBundle (void);
+	static int updateRhoBundle(const String &root_path, const String &from_path);
+	static void showMessage (HWND hWnd, int rrbErrCode);
 };
 
 #endif

data/platform/wm/rhodes/DateTimePicker.cpp

@@ -5,6 +5,9 @@
 #include "Utils.h"
 #include "DateTimePicker.h"
 
+extern "C" int rho_sys_get_screen_height();
+extern "C" int rho_sys_get_screen_width();
+
 #define DLG_ITEM_SET_FONT_BOLD(ITEM_ID)							\
 {																\
 	HFONT hFont = GetDlgItem((ITEM_ID)).GetFont();				\
@@ -17,7 +20,7 @@
 
 
 /*
- * TODO: title and initial time, flexible behavour 
+ * TODO: title and initial time
  */
 
 extern "C" HWND getMainWnd();
@@ -36,10 +39,10 @@ CDateTimePickerDialog::~CDateTimePickerDialog ()
 
 LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
-#if defined(_WIN32_WCE)
-	//USES_CONVERSION;
 	SetWindowText(_T("Date"));
 
+#if defined(_WIN32_WCE)
+
     SHINITDLGINFO shidi = { SHIDIM_FLAGS, m_hWnd, SHIDIF_SIZEDLGFULLSCREEN };
     RHO_ASSERT(SHInitDialog(&shidi));
 
@@ -49,6 +52,14 @@ LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LP
     mbi.nToolBarId = IDR_GETURL_MENUBAR;
     mbi.hInstRes = _AtlBaseModule.GetResourceInstance();
     RHO_ASSERT(SHCreateMenuBar(&mbi));
+	GotoDlgCtrl(GetDlgItem(IDC_DATE_CTRL));
+
+#else 
+
+	CreateButtons();
+	GotoDlgCtrl(m_btnOk);
+
+#endif
 
 	DLG_ITEM_SET_FONT_BOLD (IDC_DATE_STATIC);
 	DLG_ITEM_SET_FONT_BOLD (IDC_TIME_STATIC);
@@ -57,9 +68,6 @@ LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LP
 		GetDlgItem(IDC_TIME_CTRL).ShowWindow(SW_HIDE);
 		GetDlgItem(IDC_TIME_STATIC).ShowWindow(SW_HIDE);
 	}
-	
-	GotoDlgCtrl(GetDlgItem(IDC_DATE_CTRL));
-#endif
 
     return FALSE;
 }
@@ -129,25 +137,29 @@ CTimePickerDialog::~CTimePickerDialog ()
 
 LRESULT CTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
-#if defined(_WIN32_WCE)
-	//USES_CONVERSION;
 	SetWindowText(_T("Date"));
 
+#if defined(_WIN32_WCE)
+
     SHINITDLGINFO shidi = { SHIDIM_FLAGS, m_hWnd, SHIDIF_SIZEDLGFULLSCREEN };
     RHO_ASSERT(SHInitDialog(&shidi));
 
-
     SHMENUBARINFO mbi = { sizeof(mbi), 0 };
     mbi.hwndParent = m_hWnd;
     mbi.nToolBarId = IDR_GETURL_MENUBAR;
     mbi.hInstRes = _AtlBaseModule.GetResourceInstance();
     RHO_ASSERT(SHCreateMenuBar(&mbi));
+	GotoDlgCtrl(GetDlgItem(IDC_TIME_CTRL));
 
-	DLG_ITEM_SET_FONT_BOLD (IDC_TIME_STATIC);
+#else
+
+	CreateButtons();
+	GotoDlgCtrl(m_btnOk);
 
-	GotoDlgCtrl(GetDlgItem(IDC_TIME_CTRL));
 #endif
 
+	DLG_ITEM_SET_FONT_BOLD (IDC_TIME_STATIC);
+
     return FALSE;
 }
 

data/platform/wm/rhodes/DateTimePicker.h

@@ -1,6 +1,7 @@
 #ifndef __DATETIMEPICKER_H__
 #define __DATETIMEPICKER_H__
 
+#include "OkCancelModalDialog.h"
 #include "resource.h"
 
 //TODO: delegates
@@ -9,7 +10,7 @@ class CDateTimeMessage
 public:
 	static enum 
 	{
-		FORMAT_DATE_TIME,
+		FORMAT_DATE_TIME = 0,
 		FORMAT_DATE,
 		FORMAT_TIME
 	};
@@ -37,7 +38,12 @@ public:
 	int   m_format;
 };
 
-class CDateTimePickerDialog : public CDialogImpl<CDateTimePickerDialog>
+class CDateTimePickerDialog : public 
+#if defined(OS_WINDOWS)
+	COkCancelModalDialog<CDateTimePickerDialog>
+#else
+	CDialogImpl <CDateTimePickerDialog>
+#endif
 {
 public:
 	CDateTimePickerDialog  (const CDateTimeMessage *msg);
@@ -53,11 +59,10 @@ public:
 		COMMAND_ID_HANDLER(IDCANCEL, OnCancel)
 	END_MSG_MAP()
 
-private:
+public:
 	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnOK(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-
 private:
 	int         m_format;
 	time_t      m_returnTime;
@@ -65,7 +70,13 @@ private:
 	const char *m_title;
 };
 
-class CTimePickerDialog : public CDialogImpl<CTimePickerDialog>
+
+class CTimePickerDialog : public
+#if defined(OS_WINDOWS)
+	COkCancelModalDialog<CTimePickerDialog>
+#else
+	CDialogImpl <CTimePickerDialog>
+#endif
 {
 public:
 	CTimePickerDialog  (const CDateTimeMessage *msg);

data/platform/wm/rhodes/MainWindow.cpp

@@ -580,15 +580,21 @@ void __stdcall CMainWindow::OnNavigateComplete2(IDispatch* pDisp, VARIANT * pvtU
     LOG(TRACE) + "OnNavigateComplete2: " + OLE2CT(V_BSTR(pvtURL));
 }
 
-#if defined(_WIN32_WCE)
-std::wstring& loadLoadingHtml(std::wstring& str) {
+std::wstring& loadLoadingHtml(std::wstring& str)
+{
 	FILE *file;
 	wchar_t	buf[1024];
 
-    rho::String fname = RHODESAPP().getLoadingPagePath(); 
+	rho::String fname = RHODESAPP().getLoadingPagePath();
+
+	size_t pos = fname.find("file://");
+	if (pos == 0 && pos != std::string::npos)
+		fname.erase(0, 7);
+
 	file = fopen(fname.c_str(), "r");
 
 	if(file==NULL) {
+		LOG(ERROR) + "failed to open loading page \"" + fname + "\"";
 		str.append(L"<html><head><title>Loading...</title></head><body><h1>Loading...</h1></body></html>");
 	} else {
 		while(fgetws(buf, sizeof(buf), file) != NULL) {
@@ -599,7 +605,14 @@ std::wstring& loadLoadingHtml(std::wstring& str) {
 	return str;
 }
 
-void writeToTheDoc(IPIEHTMLDocument2 *document) {
+void writeToTheDoc (
+#if defined(_WIN32_WCE)
+					IPIEHTMLDocument2 *document
+#else
+					IHTMLDocument2 *document
+#endif
+					)
+{
 	HRESULT hresult = S_OK;
 	VARIANT *param;
 	SAFEARRAY *sfArray;
@@ -635,8 +648,13 @@ void CMainWindow::ShowLoadingPage(LPDISPATCH pDisp, VARIANT* URL)
     hr = m_spIWebBrowser2->get_Document( &pHtmlDoc );
     if ( SUCCEEDED(hr) )
     {
+#if defined(_WIN32_WCE)
 		IPIEHTMLDocument2* pDoc;
 		hr = pHtmlDoc->QueryInterface(__uuidof(IPIEHTMLDocument2),  (void**)&pDoc );
+#else
+		IHTMLDocument2* pDoc;
+		hr = pHtmlDoc->QueryInterface(__uuidof(IHTMLDocument2),  (void**)&pDoc );
+#endif
         if ( SUCCEEDED(hr) )
         {
 			// Write to the document
@@ -645,7 +663,6 @@ void CMainWindow::ShowLoadingPage(LPDISPATCH pDisp, VARIANT* URL)
         }
     }
 }
-#endif //_WIN32_WCE
 
 void __stdcall CMainWindow::OnDocumentComplete(IDispatch* pDisp, VARIANT * pvtURL)
 {
@@ -655,9 +672,7 @@ void __stdcall CMainWindow::OnDocumentComplete(IDispatch* pDisp, VARIANT * pvtUR
 	LPCTSTR url = OLE2CT(V_BSTR(pvtURL));
 	if (m_bLoading && wcscmp(url,_T("about:blank"))==0) {
 		LOG(TRACE) + "Show loading page";
-#if defined(_WIN32_WCE)
 		ShowLoadingPage(pDisp, pvtURL);
-#endif //_WIN32_WCE
 		m_bLoading = false; //show loading page only once
     }else
     {

data/platform/wm/rhodes/OkCancelModalDialog.h

@@ -0,0 +1,63 @@
+#pragma once
+
+#if defined(OS_WINDOWS)
+
+template <class T> class COkCancelModalDialog : public CDialogImpl<T> 
+{
+public:
+	CButton		m_btnOk;
+	CButton		m_btnCancel;
+
+	COkCancelModalDialog() 
+	{
+		m_width = m_height = 0;
+		m_xborder = m_yborder  =0;
+		m_btnHeight = 0;
+	};
+
+	void CreateButtons () 
+	{
+		Maximize();
+
+		RECT rect;
+		rect.left    = 1;
+		rect.top     = m_height - m_btnHeight;
+		rect.right   = rect.left + (m_width >> 1) - 2;
+		rect.bottom  = rect.top  + m_btnHeight;
+		m_btnOk.Create(m_hWnd, rect, TEXT("Ok"), WS_CHILD | WS_VISIBLE, 0, IDOK);
+	
+		rect.left    = (m_width >> 1);
+		rect.top     = m_height - m_btnHeight;
+		rect.right   = rect.left + (m_width >> 1) + 2;
+		rect.bottom  = rect.top  + m_btnHeight;
+		m_btnCancel.Create(m_hWnd, rect,TEXT("Cancel"),WS_CHILD|WS_VISIBLE,0,IDCANCEL);
+	}
+
+private:
+
+	void Maximize () 
+	{
+		RECT rect;
+		NONCLIENTMETRICS ncm = { sizeof(NONCLIENTMETRICS) };
+
+		GetParent().GetWindowRect(&rect);
+		SystemParametersInfo ( SPI_GETNONCLIENTMETRICS, 0, &ncm, false );
+
+		m_width = rect.right - rect.left - GetSystemMetrics(SM_CXEDGE)*2;
+		m_height = rect.bottom - rect.top - GetSystemMetrics(SM_CYCAPTION) - GetSystemMetrics(SM_CYEDGE)*2;
+		m_xborder = GetSystemMetrics(SM_CXEDGE) > GetSystemMetrics(SM_CXBORDER) ? 
+									GetSystemMetrics(SM_CXEDGE) : GetSystemMetrics(SM_CXBORDER);
+		m_yborder = GetSystemMetrics(SM_CYEDGE) > GetSystemMetrics(SM_CYBORDER) ? 
+									GetSystemMetrics(SM_CYEDGE) : GetSystemMetrics(SM_CYBORDER);
+		m_btnHeight = ncm.iMenuHeight+ncm.iBorderWidth * 4 + 2;
+
+		MoveWindow(rect.left + m_xborder, rect.top  + GetSystemMetrics(SM_CYCAPTION), m_width, m_height);
+	}
+
+private:
+	int m_width, m_height;
+	int m_xborder, m_yborder;
+	int m_btnHeight;
+};
+
+#endif