platform/wm/rhodes/AppManager.cpp in rhodes-2.3.2 vs platform/wm/rhodes/AppManager.cpp in rhodes-2.4.0.beta.1

@@ -12,70 +12,61 @@
 #include "common/AutoPointer.h"
 #include "common/StringConverter.h"
 
 using namespace rho::common;
 
-extern "C" wchar_t* wce_mbtowc(const char* a);
-
 CAppManager::CAppManager(void)
 {
 }
 
 CAppManager::~CAppManager(void)
 {
 }
 
 bool CAppManager::RemoveFolder(String pathname)
 {
-	if (pathname.length() > 0) {
-		LPWSTR  swPath = wce_mbtowc(pathname.c_str());
+	if (pathname.length() > 0) 
+    {
+		StringW  swPath = convertToStringW(pathname);
 		TCHAR name[MAX_PATH+2];
-		wsprintf(name, L"%s%c", swPath, '\0');
+        wsprintf(name, L"%s%c", swPath.c_str(), '\0');
 
 		SHFILEOPSTRUCT fop;
 
 		fop.hwnd = NULL;
 		fop.wFunc = FO_DELETE;		
 		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());
+		StringW  swPathFrom = convertToStringW(pathFrom);
+		StringW  swPathTo   = convertToStringW(pathTo);
 
 		TCHAR tcPathFrom[MAX_PATH+2];
 		TCHAR tcPathTo[MAX_PATH+2];
 
-		wsprintf(tcPathFrom, L"%s%c", swPathFrom,'\0');
-		wsprintf(tcPathTo, L"%s%c", swPathTo,'\0');
+        wsprintf(tcPathFrom, L"%s%c", swPathFrom.c_str(),'\0');
+		wsprintf(tcPathTo, L"%s%c", swPathTo.c_str(),'\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;
 }
\ No newline at end of file