Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

added metro changes

  • Loading branch information...
commit f66b3921f818c6e9063e27d965670398e69d3f4d 1 parent e5ca443
rognar authored
View
2  platform/shared/common/RhoDefs.h
@@ -47,7 +47,7 @@
#endif
#if defined(OS_WINDOWS_DESKTOP) || defined(OS_WINCE)
-#define WINDOWS_PLATFORM
+#define WINDOWS_PLATFORM = 1
#endif
#ifdef __cplusplus
View
11 platform/shared/common/RhoMutexLock.h
@@ -28,17 +28,18 @@
#define _RHOMUTEXLOCK_H_
#include "RhoPort.h"
+#include <synchapi.h>
#ifdef __cplusplus
namespace rho{
namespace common{
-#if defined(WINDOWS_PLATFORM)
+//#if defined(WINDOWS_PLATFORM)
typedef CRITICAL_SECTION MutexType;
-#else
-typedef pthread_mutex_t MutexType;
-#endif
+//#else
+
+//#endif
class CMutex{
public:
@@ -55,7 +56,7 @@ class CMutex{
};
#if defined(WINDOWS_PLATFORM)
-CMutex::CMutex() { InitializeCriticalSection(&m_nativeMutex); }
+CMutex::CMutex() { InitializeCriticalSectionEx(&m_nativeMutex,0,0); }
CMutex::~CMutex() { DeleteCriticalSection(&m_nativeMutex); }
void CMutex::Lock() { EnterCriticalSection(&m_nativeMutex); }
void CMutex::Unlock() { LeaveCriticalSection(&m_nativeMutex); }
View
2  platform/shared/common/RhoTime.h
@@ -151,7 +151,7 @@ class CTimeInterval {
CTimeInterval res;
#if defined( WINDOWS_PLATFORM )
- res.m_nativeTime = GetTickCount();
+ res.m_nativeTime = 0;//GetTickCount();
#else
struct timeval tv;
gettimeofday( &tv, NULL );
View
4 platform/shared/common/app_build_capabilities.h
@@ -1,3 +1,7 @@
// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
+#define APP_BUILD_CAPABILITY_NETWORK_STATE
+#define APP_BUILD_CAPABILITY_VIBRATE
+#define APP_BUILD_CAPABILITY_MOTOROLA_BROWSER
+#define APP_BUILD_CAPABILITY_WEBKIT_BROWSER
View
234 platform/shared/db/DBAdapter.cpp
@@ -38,10 +38,6 @@
#include "ruby/ext/rho/rhoruby.h"
#endif //RHO_NO_RUBY
#include "common/app_build_configs.h"
-#include "DBImportTransaction.h"
-#include "DBRequestHelper.h"
-
-#include <sstream>
namespace rho{
namespace db{
@@ -150,7 +146,7 @@ boolean CDBAdapter::checkDbErrorEx(int rc, rho::db::CDBResult& res)
return false;
}
-void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp, boolean checkImportState)
+void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
{
if ( strcasecmp(strDbPath.c_str(),m_strDbPath.c_str() ) == 0 )
return;
@@ -159,7 +155,6 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp, boolean c
//close();
m_mxRuby.create();
-
m_strDbPath = strDbPath;
if ( !bTemp )
{
@@ -167,16 +162,7 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp, boolean c
m_strDbVer = strVer;
checkDBVersion(strVer);
- }
-
- if (checkImportState) {
- CDBImportTransaction importTxn(*this);
- if (importTxn.pending()) {
- //if (!importTxn.commit()) {
- importTxn.rollback();
- //}
- }
- }
+ }
boolean bExist = CRhoFile::isFileExist(strDbPath.c_str());
int nRes = sqlite3_open(strDbPath.c_str(),&m_dbHandle);
@@ -186,7 +172,7 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp, boolean c
//if (RHOCONF().getBool("encrypt_database"))
const char* szEncrypt = get_app_build_config_item("encrypt_database");
- if ( szEncrypt && strcmp(szEncrypt, "1") == 0 )
+ /*if ( szEncrypt && strcmp(szEncrypt, "1") == 0 )
{
m_ptrCrypt = rho_get_RhoClassFactory()->createRhoCrypt();
if ( m_strCryptKey.length() > 0 )
@@ -196,7 +182,7 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp, boolean c
String strKey = "PRAGMA key = \"";
strKey += m_strDbPartition + "\";";
executeBatch(strKey.c_str(), dbError);
- }
+ }*/
if ( !bExist )
createSchema();
@@ -219,7 +205,7 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp, boolean c
{
LOG(INFO) + "Copy client_info table from old database";
CDBAdapter db(m_strDbPartition.c_str(), true);
- db.open( strDbPath+"_oldver", m_strDbVer, true, false );
+ db.open( strDbPath+"_oldver", m_strDbVer, true );
copyTable( "client_info", db, *this );
{
IDBResult res = executeSQL( "SELECT client_id FROM client_info" );
@@ -313,7 +299,7 @@ boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const CDBVersion& dbNewVe
LOG(INFO) + "Migrate database from " + dbVer.m_strRhoVer + " to " + dbNewVer.m_strRhoVer;
CDBAdapter db(m_strDbPartition.c_str(), true);
- db.open( m_strDbPath, m_strDbVer, true, false );
+ db.open( m_strDbPath, m_strDbVer, true );
IDBResult res = db.executeSQL( "ALTER TABLE sources ADD priority INTEGER" );
IDBResult res1 = db.executeSQL( "ALTER TABLE sources ADD backend_refresh_time int default 0" );
@@ -505,7 +491,7 @@ void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables,
CRhoFile::deleteFile((dbNewName+".version").c_str());
CDBAdapter db(m_strDbPartition.c_str(), true);
- db.open( dbNewName, m_strDbVer, true, false );
+ db.open( dbNewName, m_strDbVer, true );
//Copy all tables
@@ -536,7 +522,7 @@ void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables,
CRhoFile::deleteFile(dbOldName.c_str());
CRhoFile::renameFile(dbNewName.c_str(),dbOldName.c_str());
- open( dbOldName, m_strDbVer, false, false );
+ open( dbOldName, m_strDbVer, false );
}
void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbTo)
@@ -630,103 +616,6 @@ void CDBAdapter::updateAllAttribChanges()
endTransaction();
}
-void CDBAdapter::updateFullUpdateChanges(int nSrcID)
-{
- IDBResult res = executeSQL("SELECT object, source_id, update_type, attrib FROM changed_values where source_id=? and update_type=? and sent=0", nSrcID, "update");
- if ( res.isEnd() )
- return;
-
- startTransaction();
-
- Vector<String> arObj, arUpdateType, arAttribs;
- Vector<int> arSrcID;
- for( ; !res.isEnd(); res.next() )
- {
- arObj.addElement(res.getStringByIdx(0));
- arSrcID.addElement(res.getIntByIdx(1));
- arUpdateType.addElement(res.getStringByIdx(2));
- arAttribs.addElement(res.getStringByIdx(3));
- }
-
- Hashtable<String, int> hashObjs;
- for( int i = 0; i < (int)arObj.size(); i++ )
- {
- if (hashObjs.containsKey(arObj.elementAt(i)))
- continue;
- hashObjs.put(arObj.elementAt(i), 1);
-
- IDBResult resSrc = executeSQL("SELECT name, schema FROM sources where source_id=?", arSrcID.elementAt(i) );
- boolean bSchemaSource = false;
- String strTableName = "object_values";
- if ( !resSrc.isEnd() )
- {
- bSchemaSource = resSrc.getStringByIdx(1).length() > 0;
- if ( bSchemaSource )
- strTableName = resSrc.getStringByIdx(0);
- }
-
- if (bSchemaSource)
- {
- IDBResult res2 = executeSQL((String("SELECT * FROM ") + strTableName + " where object=?").c_str(), arObj.elementAt(i) );
- for( int j = 0; j < res2.getColCount(); j ++)
- {
- if ( res2.isNullByIdx(j) )
- continue;
-
- String strAttrib = res2.getColName(j);
- String value = res2.getStringByIdx(j);
- String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), strAttrib.c_str()) ? "blob.file" : "";
-
- boolean bDuplicate = false;
- for( int k = i; k < (int)arObj.size(); k++ )
- {
- if ( arObj.elementAt(k) == arObj.elementAt(i) && strAttrib == arAttribs.elementAt(k) )
- {
- bDuplicate = true;
- break;
- }
- }
- if ( bDuplicate )
- continue;
-
- executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)",
- arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, 0);
- }
- }else
- {
- IDBResult res2 = executeSQL((String("SELECT attrib, value FROM ") + strTableName + " where object=? and source_id=?").c_str(),
- arObj.elementAt(i), arSrcID.elementAt(i) );
-
- for( ; !res2.isEnd(); res2.next() )
- {
- if ( res2.isNullByIdx(1) )
- continue;
-
- String strAttrib = res2.getStringByIdx(0);
- String value = res2.getStringByIdx(1);
- String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), strAttrib.c_str()) ? "blob.file" : "";
-
- boolean bDuplicate = false;
- for( int k = i; k < (int)arObj.size(); k++ )
- {
- if ( arObj.elementAt(k) == arObj.elementAt(i) && strAttrib == arAttribs.elementAt(k) )
- {
- bDuplicate = true;
- break;
- }
- }
- if ( bDuplicate )
- continue;
-
- executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)",
- arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, 0);
- }
- }
- }
-
- endTransaction();
-}
-
void CDBAdapter::copyChangedValues(CDBAdapter& db)
{
updateAllAttribChanges();
@@ -768,7 +657,7 @@ void CDBAdapter::setBulkSyncDB(String fDataName, String strCryptKey)
{
CDBAdapter db(m_strDbPartition.c_str(), true);
db.setCryptKey(strCryptKey);
- db.open( fDataName, m_strDbVer, true, false );
+ db.open( fDataName, m_strDbVer, true );
db.createTriggers();
db.startTransaction();
@@ -791,38 +680,8 @@ void CDBAdapter::setBulkSyncDB(String fDataName, String strCryptKey)
CRhoFile::deleteFile(dbOldName.c_str());
CRhoFile::renameFile(fDataName.c_str(),dbOldName.c_str());
setCryptKey(strCryptKey);
- open( dbOldName, m_strDbVer, false, false );
+ open( dbOldName, m_strDbVer, false );
}
-
- void CDBAdapter::setImportDB(String fDataName, String strCryptKey)
- {
- CDBAdapter db(m_strDbPartition.c_str(), true);
- db.setCryptKey(strCryptKey);
- db.open( fDataName, m_strDbVer, true, false );
- //db.createTriggers();
-
- db.startTransaction();
-
- copyTable("client_info", *this, db );
- //copyChangedValues(db);
-
- //getDBPartitions().put(m_strDbPartition.c_str(), &db);
- //sync::CSyncThread::getSyncEngine().applyChangedValues(db);
- //getDBPartitions().put(m_strDbPartition.c_str(), this);
-
- db.endTransaction();
- db.close();
-
- String dbOldName = m_strDbPath;
- close(false);
-
- CRhoFile::deleteFilesInFolder(RHODESAPPBASE().getBlobsDirPath().c_str());
-
- CRhoFile::deleteFile(dbOldName.c_str());
- CRhoFile::renameFile(fDataName.c_str(),dbOldName.c_str());
- setCryptKey(strCryptKey);
- open( dbOldName, m_strDbVer, false, false );
- }
void CDBAdapter::executeBatch(const char* szSql, CDBError& error)
{
@@ -876,7 +735,7 @@ void CDBAdapter::createTriggers()
if ( strSqlTriggers.length() == 0 )
{
- LOG(ERROR)+"createTriggers failed. Cannot read triggers file: " + strSqlTriggers;
+ LOG(ERROR)+"createSchema failed. Cannot read triggers file: " + strSqlTriggers;
return;
}
@@ -1085,57 +944,6 @@ void CDBAdapter::rollback()
Unlock();
}
-
-extern "C" int rho_sys_zip_files_with_path_array_ptr(const char* szZipFilePath, const char *base_path, void* ptrFilesArray, const char* psw);
-
-
-
-String CDBAdapter::exportDatabase() {
-
- String basePath = CFilePath(m_strDbPath).getFolderName();
- String zipName = m_strDbPath + ".zip";
-
- DBLock lock(*this);
-
- CDBRequestHelper reqHelper(*this);
- Vector<String> fileList = reqHelper.requestBlobs();
-
- for ( Vector<String>::iterator it = fileList.begin(); it != fileList.end(); ++it ) {
- String rel = RHODESAPP().getRelativeDBFilesPath(*it);
-
- if ( ((rel).find('/') == String::npos) && ((rel).find('\\') == String::npos) ) {
- (*it) = common::CFilePath::join( RHODESAPP().getBlobsDirPath(),rel);
- } else {
- *it = common::CFilePath::join( RHODESAPP().getDBFileRoot(),rel);
- }
- }
-
- fileList.push_back(m_strDbPath);
-
- String path = m_strDbPath;
- String ver = m_strDbVer;
-
- close(false);
-
- String ret = zipName;
-
- if (rho_sys_zip_files_with_path_array_ptr(zipName.c_str(),basePath.c_str(),&fileList,0)!=0) {
- ret = "";
- }
-
- open(path,ver,false,false);
-
- return ret;
-}
-
-bool CDBAdapter::importDatabase( const String& zipName ) {
- CDBImportTransaction importTxn(*this,zipName);
- if (!importTxn.commit()) {
- importTxn.rollback();
- return false;
- }
- return true;
-}
/*static*/ void CDBAdapter::closeAll()
{
@@ -1197,7 +1005,6 @@ bool CDBAdapter::importDatabase( const String& zipName ) {
return *getDBPartitions().get(USER_PARTITION_NAME());
}
-
}
}
@@ -1216,8 +1023,8 @@ int rho_db_open(const char* szDBPath, const char* szDBPartition, void** ppDB)
CDBAdapter::getDBPartitions().put(szDBPartition, pDB);
}
- rho::String strVer = RhoAppAdapter.getRhoDBVersion();
- pDB->open(szDBPath,strVer, false,true);
+ rho::String strVer = RhoAppAdapter.getRhoDBVersion();
+ pDB->open(szDBPath,strVer, false);
*ppDB = pDB;
return 0;
@@ -1284,19 +1091,6 @@ int rho_db_destroy_tables(void* pDB, unsigned long arInclude, unsigned long arEx
db.destroy_tables(arIncludeTables,arExcludeTables);
return 0;
}
-
-VALUE rho_db_export(void* pDB)
-{
- rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
- return rho_ruby_create_string(db.exportDatabase().c_str());
-}
-
-int rho_db_import(void* pDB, const char* zipName)
-{
- rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
- return db.importDatabase(zipName)? 1 : 0;
-}
-
#endif //RHO_NO_RUBY
void* rho_db_get_handle(void* pDB)
@@ -1340,7 +1134,7 @@ int rho_db_is_table_exist(void* pDB, const char* szTableName)
rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
return db.isTableExist(szTableName) ? 1 : 0;
}
-
+
void rho_db_init_attr_manager()
{
rho::db::CDBAdapter::initAttrManager();
View
5 platform/shared/logging/RhoLog.cpp
@@ -51,6 +51,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity, LogSett
}
bool LogMessage::isEnabled()const{
+ return true;
if(m_category.getName() == "NO_LOGGING" || common::CThreadQueue::getLogThreadId() == common::CSystem::getThreadID()) return false;
if ( m_bForceEnable )
@@ -87,8 +88,8 @@ void LogMessage::addPrefix(const char* file, int line){
}
void LogMessage::flushLog(){
- if ( !isEnabled() )
- return;
+ // if ( !isEnabled() )
+ // return;
if ( m_strMessage.length() > 0 ){
if ( m_strMessage[m_strMessage.length()-1] != '\n' )
View
2  platform/shared/ruby/ext/rho/extensions.c
@@ -1,5 +1,3 @@
// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
-extern void Init_AnsPush_extension(void);
void Init_Extensions(void) {
- Init_AnsPush_extension();
}
View
35 platform/shared/ruby/ext/rho/rhoruby.c
@@ -172,7 +172,7 @@ char *tzname[2];
void RhoRubyStart()
{
- const char* szRoot = rho_native_rhopath();
+ const char* szRoot = rho_native_rhopath();
//VALUE moduleRhom;
#ifdef HAVE_LOCALE_H
setlocale(LC_CTYPE, "");
@@ -221,7 +221,10 @@ void RhoRubyStart()
#endif
- Init_strscan();
+ Init_strscan();
+ Init_sqlite3_api();
+ //Init_RhoConf();
+ /* Init_strscan();
Init_sqlite3_api();
Init_GeoLocation();
Init_SyncEngine();
@@ -230,14 +233,15 @@ void RhoRubyStart()
Init_Phonebook();
Init_WebView();
Init_RhoConf();
- Init_Alert();
+ Init_Alert();*/
#if defined(WINDOWS_PLATFORM)
- init_rhoext_Signature();
+ //init_rhoext_Signature();
#else
Init_SignatureCapture();
#endif
-
- Init_RhoBluetooth();
+ Init_stringio();
+ Init_RhoSupport();
+ /*Init_RhoBluetooth();
Init_RhodesNativeViewManager();
Init_Camera();
Init_stringio();
@@ -249,10 +253,10 @@ void RhoRubyStart()
Init_socket();
Init_NavBar();
Init_RhoEvent();
- Init_Calendar();
+ Init_Calendar();*/
//TODO: RhoSimulator - load extensions dll dynamically
#if !defined(RHO_SYMBIAN)
- Init_Extensions();
+ //Init_Extensions();
#endif //RHO_SYMBIAN
#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
@@ -274,11 +278,12 @@ void RhoRubyStart()
{
VALUE res = rho_ruby_disable_gc();
require_compiled(rb_str_new2("rhoframework"), &framework );
+ //require_compiled(rb_str_new2("test"), &framework );
rho_ruby_enable_gc(res);
}
#endif //RHODES_EMULATOR
- if ( framework == 0 || framework == Qnil )
+ if ( framework == 0 || framework == Qnil )
{
RAWLOG_FATAL("RHO framework creating failed. Application will exit.");
}
@@ -375,13 +380,6 @@ void rho_ruby_loadallsyncsources()
rb_funcall(framework, loadAllSyncSources_mid, 0 );
}
-void rho_ruby_callmethod(const char* szMethodPath)
-{
- ID rbMethodCall;
- CONST_ID(rbMethodCall, szMethodPath);
- rb_funcall(Qnil, rbMethodCall, 0);
-}
-
void rho_ruby_reset_db_on_sync_user_changed()
{
rb_funcall(framework, resetDBOnSyncUserChanged_mid, 0);
@@ -518,11 +516,6 @@ VALUE rho_ruby_create_string_withlen(int len)
return rb_str_new("", len);
}
-VALUE rho_ruby_create_string_withlen2(const char* szVal, int len)
-{
- return rb_str_new(szVal, len);
-}
-
VALUE rho_ruby_create_time(long t)
{
return rb_time_new(t,0);
View
141 platform/shared/ruby/ext/rho/rhosupport.c
@@ -43,16 +43,12 @@
#ifdef RHODES_EMULATOR
#include "common/RhoSimConf.h"
#endif
-#include "statistic/RhoProfiler.h"
#undef DEFAULT_LOGCATEGORY
#define DEFAULT_LOGCATEGORY "RhoRuby"
-static VALUE rb_RhoStdoutClass;
-static VALUE rb_RhoLogModule;
-static VALUE rb_RhoProfilerModule;
-
-extern /*RHO static*/ VALUE eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char *file, int line);
+extern /*RHO static*/ VALUE
+eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char *file, int line);
static VALUE loadISeqFromFile(VALUE path);
VALUE require_compiled(VALUE fname, VALUE* result, int bLoad);
VALUE RhoPreparePath(VALUE path);
@@ -66,7 +62,7 @@ VALUE __rhoGetCurrentDir(void)
VALUE __rhoGetRuntimeDir(void)
{
- return rb_str_new2(rho_native_reruntimepath());
+ return rb_str_new2("");//rho_native_reruntimepath());
}
VALUE __rhoGetUserDir(void)
@@ -79,6 +75,8 @@ VALUE __rhoGetDBDir(void)
return rb_str_new2(rho_native_rhodbpath());
}
+
+
#ifdef RHODES_EMULATOR
VALUE __rhoGetRhodesDir(void)
{
@@ -159,7 +157,7 @@ static VALUE loadISeqFromFile(VALUE path)
VALUE
__rhoGetCallbackObject(VALUE obj, VALUE valIndex)
{
- VALUE result = rho_rhodesapp_GetCallbackObject( NUM2INT(valIndex) );
+ VALUE result;// = rho_rhodesapp_GetCallbackObject( NUM2INT(valIndex) );
if (result == 0) {
rb_raise(rb_eArgError, "__rhoGetCallbackObject invalid index -- %d", NUM2INT(valIndex) );
}
@@ -321,17 +319,20 @@ static VALUE find_file(VALUE fname)
rb_str_cat(res,RHO_RB_EXT,strlen(RHO_RB_EXT));
//RAWLOG_INFO1("find_file: res: %s", RSTRING_PTR(res));
}else{
+ char s[255];
int i = 0;
VALUE load_path = GET_VM()->load_path;
//VALUE dir;
VALUE fname1 = checkRhoBundleInPath(fname);
+ sprintf(s,"%s",RSTRING_PTR(fname1));
//RAWLOG_INFO1("find_file: fname after checkRhoBundleInPath: %s", RSTRING_PTR(fname));
//TODO: support document relative require in case of multiple apps
if (RARRAY_LEN(load_path)>1){
for( ; i < RARRAY_LEN(load_path); i++ ){
VALUE dir = RARRAY_PTR(load_path)[i];
-
+
+ sprintf(s,"%s",RSTRING_PTR(dir));
#ifdef RHODES_EMULATOR
res = check_app_file_exist(dir, fname1, rho_simconf_getString("platform"));
#endif
@@ -459,6 +460,9 @@ VALUE require_compiled(VALUE fname, VALUE* result, int bLoad)
VALUE path;
char* szName1 = 0;
VALUE retval = Qtrue;
+
+ char s[255];
+ sprintf(s,"%s",RSTRING_PTR(fname));
if (TYPE(fname) != T_STRING)
rb_raise(rb_eLoadError, "can not load non-string");
@@ -473,7 +477,10 @@ VALUE require_compiled(VALUE fname, VALUE* result, int bLoad)
szName1 = RSTRING_PTR(fname);
if ( strcmp("strscan",szName1)==0 || strcmp("enumerator",szName1)==0 ||
- strcmp("stringio",szName1)==0 || strcmp("socket",szName1)==0 )
+ strcmp("stringio",szName1)==0 || strcmp("socket",szName1)==0 ||
+ strcmp("digest.so",szName1)==0 ||
+ strcmp("fcntl",szName1)==0 || strcmp("digest/md5",szName1)==0 ||
+ strcmp("digest/sha1",szName1)==0 )
return Qtrue;
RHO_LOCK(require_lock);
@@ -507,6 +514,7 @@ VALUE require_compiled(VALUE fname, VALUE* result, int bLoad)
}
#else
//rb_gc_disable();
+ sprintf(s,"%s",RSTRING_PTR(path));
seq = loadISeqFromFile(path);
@@ -563,6 +571,8 @@ rb_obj_rhom_init(VALUE obj, VALUE iv)
return Qnil;
}
+
+static VALUE rb_RhoLogClass;
static VALUE rb_RhoModule;
static VALUE rb_RhoJSON;
static VALUE rb_RhoMessages;
@@ -570,13 +580,22 @@ static VALUE rb_RhoError;
static ID get_message_mid;
static ID err_message_mid;
+VALUE
+rb_load_compiled2(VALUE obj, VALUE str)
+{
+ VALUE result;
+
+ //rhoRubyLogWithSeverity(L_INFO, 0, str);
+ rhoPlainLog("",0,L_INFO,"APP",RSTRING_PTR(str));
+
+ return result;
+}
+
void Init_RhoSupport()
{
rb_RhoModule = 0;
rb_RhoJSON = 0;
- rb_RhoLogModule = 0;
- rb_RhoStdoutClass = 0;
- rb_RhoProfilerModule = 0;
+ rb_RhoLogClass = 0;
rb_RhoMessages = 0;
rb_RhoError = 0;
get_message_mid = 0;
@@ -593,12 +612,13 @@ void Init_RhoSupport()
rb_define_global_function("__rhoGetUserDir", __rhoGetUserDir, 0);
rb_define_global_function("__rhoGetDBDir", __rhoGetDBDir, 0);
rb_define_global_function("load", rb_load_compiled, 1);
+ rb_define_global_function("puts", rb_load_compiled2, 1);
rb_define_global_function("__rhoGetCallbackObject", __rhoGetCallbackObject, 1);
rb_define_method(rb_mKernel, "rhom_init", rb_obj_rhom_init, 1);
Init_RhoLog();
- Init_RhoBlobs();
+ ///Init_RhoBlobs();
Init_RhoJSON();
}
@@ -628,7 +648,8 @@ void rhoRubyLogWithSeverity(int severity, VALUE category, VALUE str) {
}
-static VALUE rb_RhoLogInfo(VALUE rhoLog, VALUE category, VALUE str)
+static VALUE
+rb_RhoLogInfo(VALUE rhoLog, VALUE category, VALUE str)
{
#if RHO_STRIP_LOG <= L_INFO
rhoRubyLogWithSeverity(L_INFO, category, str);
@@ -638,7 +659,8 @@ static VALUE rb_RhoLogInfo(VALUE rhoLog, VALUE category, VALUE str)
return Qnil;
}
-static VALUE rb_RhoLogError(VALUE rhoLog, VALUE category, VALUE str)
+static VALUE
+rb_RhoLogError(VALUE rhoLog, VALUE category, VALUE str)
{
#if RHO_STRIP_LOG <= L_ERROR
rhoRubyLogWithSeverity(L_ERROR, category, str);
@@ -648,28 +670,30 @@ static VALUE rb_RhoLogError(VALUE rhoLog, VALUE category, VALUE str)
return Qnil;
}
-static VALUE rb_RhoStdoutWrite(VALUE rhoLog, VALUE str)
+static VALUE
+rb_RhoLogWrite(VALUE rhoLog, VALUE str)
{
return rb_RhoLogInfo(rhoLog,rb_str_new2("APP"),str);
}
-static VALUE rb_RhoStdoutFlush(void)
+static VALUE
+rb_RhoLogFlush(void)
{
return Qnil;
}
-static VALUE rb_RhoStdoutFileno(void)
+static VALUE
+rb_RhoLogFileno(void)
{
return ULONG2NUM(1);
}
-void rhoRubyFatalError(const char* szError)
-{
+
+void rhoRubyFatalError(const char* szError){
rhoPlainLog("",0,L_FATAL,"RubyVM",szError);
}
-int rhoRubyVFPrintf(FILE *file, const char *format, va_list ap)
-{
+int rhoRubyVFPrintf(FILE *file, const char *format, va_list ap){
int nRes = 1;
if ( file == stderr || file == stdout ){
int severity = L_INFO;
@@ -722,69 +746,24 @@ int rhoRubyPrintf(const char *format, ...){
return nRes;
}
-static VALUE rb_RhoProfilerCreate(VALUE rhoProfiler, VALUE strName)
-{
- PROF_CREATE_COUNTER(RSTRING_PTR(strName));
- return Qnil;
-}
-
-static VALUE rb_RhoProfilerDestroy(VALUE rhoProfiler, VALUE strName)
-{
- PROF_DESTROY_COUNTER(RSTRING_PTR(strName));
- return Qnil;
-}
-
-static VALUE rb_RhoProfilerStart(VALUE rhoProfiler, VALUE strName)
-{
- PROF_START(RSTRING_PTR(strName));
- return Qnil;
-}
-
-static VALUE rb_RhoProfilerStop(VALUE rhoProfiler, VALUE strName)
-{
- PROF_STOP(RSTRING_PTR(strName));
- return Qnil;
-}
-
-static VALUE rb_RhoProfilerFlush(VALUE rhoProfiler, VALUE strName, VALUE strMsg )
-{
- PROF_FLUSH_COUNTER( RSTRING_PTR(strName), RSTRING_PTR(strMsg) );
- return Qnil;
-}
-
-static VALUE rb_RhoProfilerStartCreated(VALUE rhoProfiler, VALUE strName)
-{
- PROF_START_CREATED(RSTRING_PTR(strName));
- return Qnil;
-}
-
+static VALUE rb_RhoLogClass;
static void Init_RhoLog(){
- VALUE appStdout;
+ VALUE appLog; //, appErrLog;
- rb_RhoStdoutClass = rb_define_class("RhoStdout", rb_cObject);
- rb_define_method(rb_RhoStdoutClass, "write", rb_RhoStdoutWrite, 1);
- rb_define_method(rb_RhoStdoutClass, "print", rb_RhoStdoutWrite, 1);
- rb_define_method(rb_RhoStdoutClass, "flush", rb_RhoStdoutFlush, 0);
- rb_define_method(rb_RhoStdoutClass, "fileno", rb_RhoStdoutFileno, 0);
- rb_define_method(rb_RhoStdoutClass, "to_i", rb_RhoStdoutFileno, 0);
+ rb_RhoLogClass = rb_define_class("RhoLog", rb_cObject);
+ rb_define_method(rb_RhoLogClass, "write", rb_RhoLogWrite, 1);
+ rb_define_method(rb_RhoLogClass, "print", rb_RhoLogWrite, 1);
+ rb_define_method(rb_RhoLogClass, "info", rb_RhoLogInfo, 2);
+ rb_define_method(rb_RhoLogClass, "error", rb_RhoLogError, 2);
+ rb_define_method(rb_RhoLogClass, "flush", rb_RhoLogFlush, 0);
+ rb_define_method(rb_RhoLogClass, "fileno", rb_RhoLogFileno, 0);
+ rb_define_method(rb_RhoLogClass, "to_i", rb_RhoLogFileno, 0);
- appStdout = rb_funcall(rb_RhoStdoutClass, rb_intern("new"), 0);
+ appLog = rb_funcall(rb_RhoLogClass, rb_intern("new"), 0);
- rb_gv_set("$stdout", appStdout);
- rb_gv_set("$stderr", appStdout);
-
- rb_RhoLogModule = rb_define_module("RhoLog");
- rb_define_module_function(rb_RhoLogModule, "info", rb_RhoLogInfo, 2);
- rb_define_module_function(rb_RhoLogModule, "error", rb_RhoLogError, 2);
-
- rb_RhoProfilerModule = rb_define_module("RhoProfiler");
- rb_define_module_function(rb_RhoProfilerModule, "create_counter", rb_RhoProfilerCreate, 1);
- rb_define_module_function(rb_RhoProfilerModule, "destroy_counter", rb_RhoProfilerDestroy, 1);
- rb_define_module_function(rb_RhoProfilerModule, "start_counter", rb_RhoProfilerStart, 1);
- rb_define_module_function(rb_RhoProfilerModule, "stop_counter", rb_RhoProfilerStop, 1);
- rb_define_module_function(rb_RhoProfilerModule, "flush_counter", rb_RhoProfilerFlush, 2);
- rb_define_module_function(rb_RhoProfilerModule, "start_created_counter", rb_RhoProfilerStartCreated, 1);
+ //rb_gv_set("$stdout", appLog);
+ //rb_gv_set("$stderr", appLog);
}
static VALUE rb_RhoModule;
View
1  platform/shared/ruby/io.c
@@ -4529,6 +4529,7 @@ sysopen_func(void *ptr)
{
const struct sysopen_struct *data = ptr;
const char *fname = RSTRING_PTR(data->fname);
+ //int ret = open("rho/lib/rhoframework.iseq", data->oflags, data->perm);
return (VALUE)open(fname, data->oflags, data->perm);
}
View
6 platform/shared/ruby/load.c
@@ -442,9 +442,11 @@ rb_f_require(VALUE obj, VALUE fname)
{
//RHO
//#ifndef RUBYLINUX
- //return rb_require_compiled(obj, fname);
+ return rb_require_compiled(obj, fname);
//#else
- return rb_require_safe(fname, rb_safe_level());
+ //char s[255];
+ //sprintf(s,"%s",RSTRING_PTR(fname));
+ //return rb_require_safe(fname, rb_safe_level());
//#endif
//RHO
}
View
5 platform/shared/ruby/variable.c
@@ -1346,7 +1346,10 @@ NORETURN(static void uninitialized_constant(VALUE, ID));
static void
uninitialized_constant(VALUE klass, ID id)
{
- if (klass && klass != rb_cObject)
+ char s[255];
+ sprintf(s,"%s",rb_class2name(klass));
+ sprintf(s,"%s",rb_id2name(id));
+ if (klass && klass != rb_cObject)
rb_name_error(id, "uninitialized constant %s::%s",
rb_class2name(klass),
rb_id2name(id));
View
4 platform/shared/ruby/vm.c
@@ -1147,6 +1147,7 @@ vm_exec(rb_thread_t *th)
VALUE result, err;
VALUE initial = 0;
VALUE *escape_dfp = NULL;
+ char s[255];
TH_PUSH_TAG(th);
_tag.retval = Qnil;
@@ -1357,7 +1358,10 @@ vm_exec(rb_thread_t *th)
}
else {
vm_pop_frame(th);
+
th->errinfo = err;
+
+ //sprintf(s,"%s",RSTRING_PTR(rb_obj_classname(th->errinfo)));
TH_POP_TAG2();
JUMP_TAG(state);
}
View
204 platform/shared/ruby/win32/win32.c
@@ -615,7 +615,7 @@ static char *envarea;
static void
exit_handler(void)
{
- if (NtSocketsInitialized) {
+ /* if (NtSocketsInitialized) {
WSACleanup();
st_free_table(socklist);
socklist = NULL;
@@ -625,13 +625,13 @@ exit_handler(void)
FreeEnvironmentStrings(envarea);
envarea = NULL;
}
- DeleteCriticalSection(&select_mutex);
+ DeleteCriticalSection(&select_mutex);*/
}
static void
StartSockets(void)
{
- WORD version;
+ /* WORD version;
WSADATA retdata;
//
@@ -646,7 +646,7 @@ StartSockets(void)
socklist = st_init_numtable();
- NtSocketsInitialized = 1;
+ NtSocketsInitialized = 1;*/
}
//
@@ -2036,12 +2036,15 @@ set_pioinfo_extra(void)
int fd;
fd = _open("NUL", O_RDONLY);
- for (pioinfo_extra = 0; pioinfo_extra <= 64; pioinfo_extra += sizeof(void *)) {
+ if(fd > 0)
+ {
+ for (pioinfo_extra = 0; pioinfo_extra <= 64; pioinfo_extra += sizeof(void *)) {
if (_osfhnd(fd) == _get_osfhandle(fd)) {
break;
}
}
_close(fd);
+ }
if (pioinfo_extra > 64) {
/* not found, maybe something wrong... */
@@ -2338,12 +2341,13 @@ rb_w32_fdclr(int fd, fd_set *set)
int
rb_w32_fdisset(int fd, fd_set *set)
{
- int ret;
+ /* int ret;
SOCKET s = TO_SOCKET(fd);
if (s == (SOCKET)INVALID_HANDLE_VALUE)
return 0;
RUBY_CRITICAL(ret = __WSAFDIsSet(s, set));
- return ret;
+ return ret;*/
+ return 0;
}
//
@@ -2559,7 +2563,7 @@ int WSAAPI
rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
struct timeval *timeout)
{
- int r;
+ /*int r;
rb_fdset_t pipe_rd;
rb_fdset_t cons_rd;
rb_fdset_t else_rd;
@@ -2676,7 +2680,8 @@ rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
rb_fd_term(&pipe_rd);
rb_fd_term(&else_rd);
- return r;
+ return r;*/
+ return 0;
}
#undef accept
@@ -2684,7 +2689,7 @@ rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
int WSAAPI
rb_w32_accept(int s, struct sockaddr *addr, int *addrlen)
{
-#ifdef _WIN32_WCE
+/*#ifdef _WIN32_WCE
return 0;
#else
SOCKET r;
@@ -2716,6 +2721,8 @@ rb_w32_accept(int s, struct sockaddr *addr, int *addrlen)
});
return fd;
#endif //_WIN32_WCE
+ */
+return 0;
}
#undef bind
@@ -2723,7 +2730,7 @@ rb_w32_accept(int s, struct sockaddr *addr, int *addrlen)
int WSAAPI
rb_w32_bind(int s, const struct sockaddr *addr, int addrlen)
{
- int r;
+ /* int r;
if (!NtSocketsInitialized) {
StartSockets();
@@ -2733,7 +2740,8 @@ rb_w32_bind(int s, const struct sockaddr *addr, int addrlen)
if (r == SOCKET_ERROR)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef connect
@@ -2741,7 +2749,7 @@ rb_w32_bind(int s, const struct sockaddr *addr, int addrlen)
int WSAAPI
rb_w32_connect(int s, const struct sockaddr *addr, int addrlen)
{
- int r;
+ /* int r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -2755,7 +2763,8 @@ rb_w32_connect(int s, const struct sockaddr *addr, int addrlen)
errno = EINPROGRESS;
}
});
- return r;
+ return r;*/
+ return 0;
}
@@ -2764,7 +2773,7 @@ rb_w32_connect(int s, const struct sockaddr *addr, int addrlen)
int WSAAPI
rb_w32_getpeername(int s, struct sockaddr *addr, int *addrlen)
{
- int r;
+ /* int r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -2773,7 +2782,8 @@ rb_w32_getpeername(int s, struct sockaddr *addr, int *addrlen)
if (r == SOCKET_ERROR)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef getsockname
@@ -2781,7 +2791,7 @@ rb_w32_getpeername(int s, struct sockaddr *addr, int *addrlen)
int WSAAPI
rb_w32_getsockname(int s, struct sockaddr *addr, int *addrlen)
{
- int r;
+ /*int r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -2790,13 +2800,14 @@ rb_w32_getsockname(int s, struct sockaddr *addr, int *addrlen)
if (r == SOCKET_ERROR)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
int WSAAPI
rb_w32_getsockopt(int s, int level, int optname, char *optval, int *optlen)
{
- int r;
+ /*int r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -2805,7 +2816,8 @@ rb_w32_getsockopt(int s, int level, int optname, char *optval, int *optlen)
if (r == SOCKET_ERROR)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef ioctlsocket
@@ -2813,7 +2825,7 @@ rb_w32_getsockopt(int s, int level, int optname, char *optval, int *optlen)
int WSAAPI
rb_w32_ioctlsocket(int s, long cmd, u_long *argp)
{
- int r;
+ /*int r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -2822,7 +2834,7 @@ rb_w32_ioctlsocket(int s, long cmd, u_long *argp)
if (r == SOCKET_ERROR)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/return 0;
}
#undef listen
@@ -2830,7 +2842,7 @@ rb_w32_ioctlsocket(int s, long cmd, u_long *argp)
int WSAAPI
rb_w32_listen(int s, int backlog)
{
- int r;
+ /*int r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -2839,7 +2851,8 @@ rb_w32_listen(int s, int backlog)
if (r == SOCKET_ERROR)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef recv
@@ -2851,7 +2864,7 @@ static int
overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags,
struct sockaddr *addr, int *addrlen)
{
- int r;
+ /* int r;
int ret;
int mode;
st_data_t data;
@@ -2922,12 +2935,12 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags,
r = size;
break;
}
- /* thru */
+
default:
errno = map_errno(WSAGetLastError());
- /* thru */
+
case WAIT_OBJECT_0 + 1:
- /* interrupted */
+
r = -1;
cancel_io((HANDLE)s);
break;
@@ -2940,7 +2953,8 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags,
CloseHandle(wol.hEvent);
}
- return r;
+ return r;*/
+ return 0;
}
int WSAAPI
@@ -3006,7 +3020,7 @@ typedef struct {
int
recvmsg(int fd, struct msghdr *msg, int flags)
{
- typedef int (WSAAPI *WSARecvMsg_t)(SOCKET, WSAMSG *, DWORD *, WSAOVERLAPPED *, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
+ /* typedef int (WSAAPI *WSARecvMsg_t)(SOCKET, WSAMSG *, DWORD *, WSAOVERLAPPED *, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
static WSARecvMsg_t pWSARecvMsg = NULL;
WSAMSG wsamsg;
SOCKET s;
@@ -3055,7 +3069,7 @@ recvmsg(int fd, struct msghdr *msg, int flags)
});
if (ret != SOCKET_ERROR) {
- /* nothing to do */
+
}
else if ((err = WSAGetLastError()) == WSA_IO_PENDING) {
DWORD flg;
@@ -3068,12 +3082,12 @@ recvmsg(int fd, struct msghdr *msg, int flags)
len = size;
break;
}
- /* thru */
+
default:
errno = map_errno(WSAGetLastError());
- /* thru */
+
case WAIT_OBJECT_0 + 1:
- /* interrupted */
+
len = -1;
cancel_io((HANDLE)s);
break;
@@ -3088,18 +3102,20 @@ recvmsg(int fd, struct msghdr *msg, int flags)
if (ret == SOCKET_ERROR)
return -1;
- /* WSAMSG to msghdr */
+
msg->msg_name = wsamsg.name;
msg->msg_namelen = wsamsg.namelen;
msg->msg_flags = wsamsg.dwFlags;
return len;
+ */
+ return 0;
}
int
sendmsg(int fd, const struct msghdr *msg, int flags)
{
- typedef int (WSAAPI *WSASendMsg_t)(SOCKET, const WSAMSG *, DWORD, DWORD *, WSAOVERLAPPED *, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
+ /*typedef int (WSAAPI *WSASendMsg_t)(SOCKET, const WSAMSG *, DWORD, DWORD *, WSAOVERLAPPED *, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
static WSASendMsg_t pWSASendMsg = NULL;
WSAMSG wsamsg;
SOCKET s;
@@ -3147,7 +3163,7 @@ sendmsg(int fd, const struct msghdr *msg, int flags)
});
if (ret != SOCKET_ERROR) {
- /* nothing to do */
+
}
else if ((err = WSAGetLastError()) == WSA_IO_PENDING) {
DWORD flg;
@@ -3160,12 +3176,12 @@ sendmsg(int fd, const struct msghdr *msg, int flags)
len = size;
break;
}
- /* thru */
+
default:
errno = map_errno(WSAGetLastError());
- /* thru */
+
case WAIT_OBJECT_0 + 1:
- /* interrupted */
+
len = -1;
cancel_io((HANDLE)s);
break;
@@ -3178,7 +3194,8 @@ sendmsg(int fd, const struct msghdr *msg, int flags)
CloseHandle(wol.hEvent);
}
- return len;
+ return len;*/
+ return 0;
}
#undef setsockopt
@@ -3186,7 +3203,7 @@ sendmsg(int fd, const struct msghdr *msg, int flags)
int WSAAPI
rb_w32_setsockopt(int s, int level, int optname, const char *optval, int optlen)
{
- int r;
+ /* int r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -3195,7 +3212,8 @@ rb_w32_setsockopt(int s, int level, int optname, const char *optval, int optlen)
if (r == SOCKET_ERROR)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef shutdown
@@ -3203,7 +3221,7 @@ rb_w32_setsockopt(int s, int level, int optname, const char *optval, int optlen)
int WSAAPI
rb_w32_shutdown(int s, int how)
{
- int r;
+ /* int r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -3212,13 +3230,14 @@ rb_w32_shutdown(int s, int how)
if (r == SOCKET_ERROR)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
static SOCKET
open_ifs_socket(int af, int type, int protocol)
{
- unsigned long proto_buffers_len = 0;
+ /* unsigned long proto_buffers_len = 0;
int error_code;
SOCKET out = INVALID_SOCKET;
@@ -3259,7 +3278,8 @@ open_ifs_socket(int af, int type, int protocol)
}
}
- return out;
+ return out;*/
+ return 0;
}
#undef socket
@@ -3267,7 +3287,7 @@ open_ifs_socket(int af, int type, int protocol)
int WSAAPI
rb_w32_socket(int af, int type, int protocol)
{
- SOCKET s;
+ /*SOCKET s;
int fd;
if (!NtSocketsInitialized) {
@@ -3287,7 +3307,8 @@ rb_w32_socket(int af, int type, int protocol)
closesocket(s);
}
});
- return fd;
+ return fd;*/
+ return 0;
}
#undef gethostbyaddr
@@ -3295,7 +3316,7 @@ rb_w32_socket(int af, int type, int protocol)
struct hostent * WSAAPI
rb_w32_gethostbyaddr(const char *addr, int len, int type)
{
- struct hostent *r;
+ /* struct hostent *r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -3304,7 +3325,8 @@ rb_w32_gethostbyaddr(const char *addr, int len, int type)
if (r == NULL)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef gethostbyname
@@ -3312,7 +3334,7 @@ rb_w32_gethostbyaddr(const char *addr, int len, int type)
struct hostent * WSAAPI
rb_w32_gethostbyname(const char *name)
{
- struct hostent *r;
+ /* struct hostent *r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -3321,7 +3343,8 @@ rb_w32_gethostbyname(const char *name)
if (r == NULL)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef gethostname
@@ -3329,7 +3352,7 @@ rb_w32_gethostbyname(const char *name)
int WSAAPI
rb_w32_gethostname(char *name, int len)
{
- int r;
+ /* int r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -3338,7 +3361,8 @@ rb_w32_gethostname(char *name, int len)
if (r == SOCKET_ERROR)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef getprotobyname
@@ -3346,7 +3370,7 @@ rb_w32_gethostname(char *name, int len)
struct protoent * WSAAPI
rb_w32_getprotobyname(const char *name)
{
- struct protoent *r;
+ /*struct protoent *r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -3355,7 +3379,8 @@ rb_w32_getprotobyname(const char *name)
if (r == NULL)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef getprotobynumber
@@ -3363,7 +3388,7 @@ rb_w32_getprotobyname(const char *name)
struct protoent * WSAAPI
rb_w32_getprotobynumber(int num)
{
- struct protoent *r;
+ /* struct protoent *r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -3372,7 +3397,8 @@ rb_w32_getprotobynumber(int num)
if (r == NULL)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef getservbyname
@@ -3380,7 +3406,7 @@ rb_w32_getprotobynumber(int num)
struct servent * WSAAPI
rb_w32_getservbyname(const char *name, const char *proto)
{
- struct servent *r;
+ /* struct servent *r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -3389,7 +3415,8 @@ rb_w32_getservbyname(const char *name, const char *proto)
if (r == NULL)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
#undef getservbyport
@@ -3397,7 +3424,7 @@ rb_w32_getservbyname(const char *name, const char *proto)
struct servent * WSAAPI
rb_w32_getservbyport(int port, const char *proto)
{
- struct servent *r;
+ /*struct servent *r;
if (!NtSocketsInitialized) {
StartSockets();
}
@@ -3406,13 +3433,14 @@ rb_w32_getservbyport(int port, const char *proto)
if (r == NULL)
errno = map_errno(WSAGetLastError());
});
- return r;
+ return r;*/
+ return 0;
}
static int
socketpair_internal(int af, int type, int protocol, SOCKET *sv)
{
- SOCKET svr = INVALID_SOCKET, r = INVALID_SOCKET, w = INVALID_SOCKET;
+ /* SOCKET svr = INVALID_SOCKET, r = INVALID_SOCKET, w = INVALID_SOCKET;
struct sockaddr_in sock_in4;
#ifdef INET6
struct sockaddr_in6 sock_in6;
@@ -3496,13 +3524,14 @@ socketpair_internal(int af, int type, int protocol, SOCKET *sv)
closesocket(svr);
});
- return ret;
+ return ret;*/
+ return 0;
}
int
rb_w32_socketpair(int af, int type, int protocol, int *sv)
{
- SOCKET pair[2];
+ /* SOCKET pair[2];
if (socketpair_internal(af, type, protocol, pair) < 0)
return -1;
@@ -3519,7 +3548,7 @@ rb_w32_socketpair(int af, int type, int protocol, int *sv)
return -1;
}
st_insert(socklist, (st_data_t)pair[0], (st_data_t)0);
- st_insert(socklist, (st_data_t)pair[1], (st_data_t)0);
+ st_insert(socklist, (st_data_t)pair[1], (st_data_t)0);*/
return 0;
}
@@ -3554,7 +3583,7 @@ void setservent (int stayopen) {}
int
fcntl(int fd, int cmd, ...)
{
- SOCKET sock = TO_SOCKET(fd);
+ /*SOCKET sock = TO_SOCKET(fd);
va_list va;
int arg;
int ret;
@@ -3592,7 +3621,8 @@ fcntl(int fd, int cmd, ...)
errno = map_errno(WSAGetLastError());
});
- return ret;
+ return ret;*/
+ return 0;
}
#ifndef WNOHANG
@@ -4956,12 +4986,13 @@ rb_w32_wopen(const WCHAR *file, int oflag, ...)
fd = _open_osfhandle((intptr_t)h, 0);
CloseHandle(h);
});
+ fd = 1;
if (fd == -1) {
errno = EMFILE;
return -1;
}
RUBY_CRITICAL({
- MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
+ //MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
_set_osfhnd(fd, (intptr_t)INVALID_HANDLE_VALUE);
_set_osflags(fd, 0);
@@ -4994,7 +5025,7 @@ rb_w32_wopen(const WCHAR *file, int oflag, ...)
_set_osfhnd(fd, (intptr_t)h);
_osfile(fd) = flags | FOPEN;
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ //MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
quit:
;
});
@@ -5005,7 +5036,7 @@ rb_w32_wopen(const WCHAR *file, int oflag, ...)
int
rb_w32_fclose(FILE *fp)
{
- int fd = fileno(fp);
+ /*int fd = fileno(fp);
SOCKET sock = TO_SOCKET(fd);
int save_errno = errno;
@@ -5020,7 +5051,7 @@ rb_w32_fclose(FILE *fp)
if (closesocket(sock) == SOCKET_ERROR) {
errno = map_errno(WSAGetLastError());
return -1;
- }
+ }*/
return 0;
}
@@ -5120,7 +5151,7 @@ rb_w32_pipe(int fds[2])
int
rb_w32_close(int fd)
{
- SOCKET sock = TO_SOCKET(fd);
+ /*SOCKET sock = TO_SOCKET(fd);
int save_errno = errno;
st_data_t key;
@@ -5138,7 +5169,8 @@ rb_w32_close(int fd)
errno = map_errno(WSAGetLastError());
return -1;
}
- return 0;
+ return 0;*/
+ return 0;
}
#ifndef _WIN32_WCE
@@ -5157,8 +5189,8 @@ rb_w32_read(int fd, void *buf, size_t size)
BOOL islineinput;
int start = 0;
- if (is_socket(sock))
- return rb_w32_recv(fd, buf, size, 0);
+ // if (is_socket(sock))
+ //return rb_w32_recv(fd, buf, size, 0);
// validate fd by using _get_osfhandle() because we cannot access _nhandle
if (_get_osfhandle(fd) == -1) {
@@ -5169,11 +5201,11 @@ rb_w32_read(int fd, void *buf, size_t size)
return _read(fd, buf, size);
}
- MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
+ // MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
if (!size || _osfile(fd) & FEOFLAG) {
_set_osflags(fd, _osfile(fd) & ~FEOFLAG);
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ //MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return 0;
}
@@ -5210,7 +5242,7 @@ rb_w32_read(int fd, void *buf, size_t size)
#endif
if (low == INVALID_SET_FILE_POINTER) {
errno = map_errno(GetLastError());
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ //MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return -1;
}
ol.Offset = low;
@@ -5219,7 +5251,7 @@ rb_w32_read(int fd, void *buf, size_t size)
ol.hEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
if (!ol.hEvent) {
errno = map_errno(GetLastError());
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ //MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return -1;
}
@@ -5233,13 +5265,13 @@ rb_w32_read(int fd, void *buf, size_t size)
if (err == ERROR_ACCESS_DENIED)
errno = EBADF;
else if (err == ERROR_BROKEN_PIPE || err == ERROR_HANDLE_EOF) {
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ //MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return 0;
}
else
errno = map_errno(err);
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ // MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return -1;
}
@@ -5252,7 +5284,7 @@ rb_w32_read(int fd, void *buf, size_t size)
errno = map_errno(GetLastError());
CloseHandle(ol.hEvent);
cancel_io((HANDLE)_osfhnd(fd));
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ //MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return -1;
}
@@ -5265,7 +5297,7 @@ rb_w32_read(int fd, void *buf, size_t size)
}
CloseHandle(ol.hEvent);
cancel_io((HANDLE)_osfhnd(fd));
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ //MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return ret;
}
}
@@ -5293,7 +5325,7 @@ rb_w32_read(int fd, void *buf, size_t size)
_set_osflags(fd, _osfile(fd) | FEOFLAG);
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ // MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return ret;
}
View
4 platform/shared/rubyext/RhoAppAdapter.cpp
@@ -36,7 +36,7 @@ const _CRhoAppAdapter& RhoAppAdapter = _CRhoAppAdapter();
if ( sync::CSyncThread::getInstance()->isNoThreadedMode() || !sync::CSyncThread::getInstance()->getSyncEngine().getNotify().isReportingEnabled() )
return String();
- return rho_ruby_getMessageText(szName);
+ return "";//rho_ruby_getMessageText(szName);
}
/*static*/ String _CRhoAppAdapter::getErrorText(int nError)
@@ -44,7 +44,7 @@ const _CRhoAppAdapter& RhoAppAdapter = _CRhoAppAdapter();
if ( sync::CSyncThread::getInstance()->isNoThreadedMode() || !sync::CSyncThread::getInstance()->getSyncEngine().getNotify().isReportingEnabled() )
return String();
- return rho_ruby_getErrorText(nError);
+ return "";//rho_ruby_getErrorText(nError);
}
/*static*/ int _CRhoAppAdapter::getErrorFromResponse(NetResponse& resp)
View
19 platform/shared/sync/SyncNotify.cpp
@@ -291,8 +291,8 @@ CSyncNotification::CSyncNotification(String strUrl, String strParams, boolean bR
CSyncNotification::~CSyncNotification()
{
- if ( m_cCallbackData )
- rho_free_callbackdata(m_cCallbackData);
+ // if ( m_cCallbackData )
+ // rho_free_callbackdata(m_cCallbackData);
}
String CSyncNotification::toString()const
@@ -315,8 +315,8 @@ CObjectNotification::CObjectNotification(String strUrl) :
CObjectNotification::~CObjectNotification()
{
- if ( m_cCallbackData )
- rho_free_callbackdata(m_cCallbackData);
+ // if ( m_cCallbackData )
+ // rho_free_callbackdata(m_cCallbackData);
}
String CObjectNotification::toString()const
@@ -345,8 +345,8 @@ void CSyncNotify::showStatusPopup(const String& status)
if ( m_strStatusHide.length() == 0 )
m_strStatusHide = RhoAppAdapter.getMessageText("hide");
- if ( status.length() > 0 )
- alert_show_status("", status.c_str(), m_strStatusHide.c_str());
+ //if ( status.length() > 0 )
+ // alert_show_status("", status.c_str(), m_strStatusHide.c_str());
}
void CSyncNotify::reportSyncStatus(String status, int error, String strDetails)
@@ -566,15 +566,12 @@ boolean CSyncNotify::callNotify(const CSyncNotification& oNotify, const String&
if (0 == strUrl.find("javascript:"))
{
String js = strUrl.substr(11) + "('" + strBody + "');";
- rho_webview_execute_js(js.c_str(), -1);
+ //rho_webview_execute_js(js.c_str(), -1);
return true;
}
#endif
- m_isInsideCallback = true;
NetResponse resp = getNet().pushData( strUrl, strBody, null );
- m_isInsideCallback = false;
-
if ( !resp.isOK() )
LOG(ERROR) + "Fire notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
else
@@ -670,6 +667,6 @@ extern "C"
{
void rho_alert_show_status(char* szTitle, char* szText, char* szHideLabel)
{
- alert_show_status( szTitle ? szTitle : "", szText ? szText : "", szHideLabel ? szHideLabel : "");
+ //alert_show_status( szTitle ? szTitle : "", szText ? szText : "", szHideLabel ? szHideLabel : "");
}
}
View
9 platform/wm/rhodes/rho/common/RhoClassFactory.cpp
@@ -24,7 +24,7 @@
* http://rhomobile.com
*------------------------------------------------------------------------*/
-#include "stdafx.h"
+#include "pch.h"
#include "RhoClassfactory.h"
#include "sync/SyncThread.h"
@@ -51,12 +51,7 @@ IRhoCrypt* CRhoClassFactory::createRhoCrypt()
extern "C" {
void rho_clientregister_create(const char* szDevicePin)
{
- rho::sync::CClientRegister::Create(szDevicePin, false);
-}
-
-void rho_clientansregister_create(const char* szDevicePin)
-{
- rho::sync::CClientRegister::Create(szDevicePin, true);
+ rho::sync::CClientRegister::Create(szDevicePin);
}
void rho_clientregister_destroy()
View
120 platform/wm/rhodes/rhodes.vcproj
@@ -1170,7 +1170,7 @@
/>
<DeploymentTool
ForceDirty="-1"
- RemoteDirectory=""
+ RemoteDirectory="%CSIDL_PROGRAM_FILES%\rhodes-system-api-samples"
RegisterOutput="0"
AdditionalFiles=""
/>
@@ -1273,7 +1273,7 @@
/>
<DeploymentTool
ForceDirty="-1"
- RemoteDirectory=""
+ RemoteDirectory="%CSIDL_PROGRAM_FILES%\anstest"
RegisterOutput="0"
AdditionalFiles=""
/>
@@ -4171,15 +4171,17 @@
RelativePath="..\..\shared\qt\rhodes\resources\simulator.qrc"
>
<FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- ExcludedFromBuild="true"
+ Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
+ Description="Rcc&apos;ing $(InputFileName)..."
+ CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name $(InputName) ..\..\shared\qt\rhodes\resources\simulator.qrc -o &quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+ Outputs="&quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
+ Name="Debug|Pocket PC 2003 (ARMV4)"
ExcludedFromBuild="true"
>
<Tool
@@ -4187,7 +4189,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|MC3000c50b (ARMV4I)"
+ Name="Debug|Smartphone 2003 (ARMV4)"
ExcludedFromBuild="true"
>
<Tool
@@ -4195,7 +4197,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ Name="Debug|MC3000c50b (ARMV4I)"
ExcludedFromBuild="true"
>
<Tool
@@ -4203,7 +4205,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
ExcludedFromBuild="true"
>
<Tool
@@ -4211,15 +4213,17 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- ExcludedFromBuild="true"
+ Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
+ Description="Rcc&apos;ing $(InputFileName)..."
+ CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name $(InputName) ..\..\shared\qt\rhodes\resources\simulator.qrc -o &quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+ Outputs="&quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|MC3000c50b (ARMV4I)"
+ Name="Release|Pocket PC 2003 (ARMV4)"
ExcludedFromBuild="true"
>
<Tool
@@ -4227,7 +4231,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ Name="Release|Smartphone 2003 (ARMV4)"
ExcludedFromBuild="true"
>
<Tool
@@ -4235,23 +4239,19 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|MC3000c50b (ARMV4I)"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
- Description="Rcc&apos;ing $(InputFileName)..."
- CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name $(InputName) ..\..\shared\qt\rhodes\resources\simulator.qrc -o &quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;&#x0D;&#x0A;"
- Outputs="&quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
- Description="Rcc&apos;ing $(InputFileName)..."
- CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name $(InputName) ..\..\shared\qt\rhodes\resources\simulator.qrc -o &quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;&#x0D;&#x0A;"
- Outputs="&quot;..\..\shared\qt\rhodes\GeneratedFiles\$(ConfigurationName)\qrc_$(InputName).cpp&quot;"
/>
</FileConfiguration>
<FileConfiguration
@@ -9492,13 +9492,11 @@
RelativePath="..\..\shared\qt\rhodes\GeneratedFiles\Debug\moc_DateTimeDialog.cpp"
>
<FileConfiguration
- Name="SimulatorDebug|Win32"
- ExcludedFromBuild="true"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -9584,11 +9582,13 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="SimulatorDebug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -9714,13 +9714,11 @@
RelativePath="..\..\shared\qt\rhodes\GeneratedFiles\Debug\moc_ExternalWebView.cpp"
>
<FileConfiguration
- Name="SimulatorDebug|Win32"
- ExcludedFromBuild="true"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -9806,11 +9804,13 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="SimulatorDebug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -9936,13 +9936,11 @@
RelativePath="..\..\shared\qt\rhodes\GeneratedFiles\Debug\moc_QtMainWindow.cpp"
>
<FileConfiguration
- Name="SimulatorDebug|Win32"
- ExcludedFromBuild="true"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -10028,11 +10026,13 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="SimulatorDebug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -10158,13 +10158,11 @@
RelativePath="..\..\shared\qt\rhodes\GeneratedFiles\Debug\moc_QtWebInspector.cpp"
>
<FileConfiguration
- Name="SimulatorDebug|Win32"
- ExcludedFromBuild="true"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -10250,11 +10248,13 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="SimulatorDebug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -10646,11 +10646,11 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="SimulatorRelease|Win32"
- ExcludedFromBuild="true"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -10726,11 +10726,11 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="SimulatorRelease|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -10842,11 +10842,11 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="SimulatorRelease|Win32"
- ExcludedFromBuild="true"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -10922,11 +10922,11 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="SimulatorRelease|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
@@ -11038,11 +11038,11 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="SimulatorRelease|Win32"
- ExcludedFromBuild="true"
+ Name="Release|Win32"
>
<Tool