Commits

Anonymous committed af8e26b Merge

rebase to DEV300_m87

Comments (0)

Files changed (1225)

 ^[^/]+/unxsols\d+(\.pro)?$
 ^[^/]+/wntgcci(\.pro)?$
 ^[^/]+/wntmsci\d+(\.pro)?$
-^[^/]+\.pro\.build\.html$
 ^solver$
 
 # Emacs backups (XXX~, #XXX#, .#XXX):
 a61542f65727f9e64991c85056c22f890fd8934b OOO330_m1
 004715ace8e76d1c9841d0fadfb60b0a48fa186f DEV300_m85
 c85a59971620bc9e04ad689600ee9846f0f9dc18 OOO330_m2
+1c32319bb02fdf173de6a609fca9f2e9c9f4c73a DEV300_m86
+c605e94568651ba1b2626a6f37aa4c7ca4b4710f OOO330_m3
+03cf80e29979c28332a36bcb00a8947032433b3d OOO330_m4
+d9859c6e249e31fbd651f9a98c2fbe85d6f2df80 OOO330_m5

automation/inc/automation/communi.hxx

 	CommunicationManagerClient( BOOL bUseMultiChannel = FALSE );
 };
 
-class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public NAMESPACE_VOS(OThread)
+class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public vos::OThread
 {
 public:
-	CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket );
+	CommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket );
 	virtual ~CommunicationLinkViaSocket();
 
 	virtual BOOL IsCommunicationError();
 	virtual BOOL ShutdownCommunication();
 	ULONG nConnectionClosedEventId;
 	ULONG nDataReceivedEventId;
-	NAMESPACE_VOS(OMutex) aMConnectionClosed;	// Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
-	NAMESPACE_VOS(OMutex) aMDataReceived;		// Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+	vos::OMutex aMConnectionClosed;	// Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+	vos::OMutex aMDataReceived;		// Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
 	virtual void WaitForShutdown();
 
     DECL_LINK( ShutdownLink, void* );
 	void AddConnection( CommunicationLink *pNewConnection );
 };
 
-class CommunicationManagerServerAcceptThread: public NAMESPACE_VOS(OThread)
+class CommunicationManagerServerAcceptThread: public vos::OThread
 {
 public:
 	CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon = CM_UNLIMITED_CONNECTIONS );
 
 private:
 	CommunicationManagerServerViaSocket* pMyServer;
-	NAMESPACE_VOS(OAcceptorSocket) *pAcceptorSocket;
+	vos::OAcceptorSocket *pAcceptorSocket;
 	ULONG nPortToListen;
 	USHORT nMaxConnections;
 	ULONG nAddConnectionEventId;
-	NAMESPACE_VOS(OMutex) aMAddConnection;	// Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+	vos::OMutex aMAddConnection;	// Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
 	void CallInfoMsg( InfoString aMsg ){ pMyServer->CallInfoMsg( aMsg ); }
 	CM_InfoType GetInfoType(){ return pMyServer->GetInfoType(); }
 
 	ByteString aHostToTalk;
 	ULONG nPortToTalk;
 protected:
-	virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, NAMESPACE_VOS(OConnectorSocket) *pCS ){ return new CommunicationLinkViaSocket( pCM, pCS ); }
+	virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS ){ return new CommunicationLinkViaSocket( pCM, pCS ); }
 };
 
 #endif

automation/inc/automation/simplecm.hxx

 	ByteString aMyName;
 
 	TCPIO* pTCPIO;
-	NAMESPACE_VOS(OStreamSocket) *pStreamSocket;
+	vos::OStreamSocket *pStreamSocket;
 
 protected:
-	SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket );
+	SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket );
 	virtual ~SimpleCommunicationLinkViaSocket();
 
-    NAMESPACE_VOS(OStreamSocket)* GetStreamSocket() { return pStreamSocket; }
-    void SetStreamSocket( NAMESPACE_VOS(OStreamSocket)* pSocket );
+    vos::OStreamSocket* GetStreamSocket() { return pStreamSocket; }
+    void SetStreamSocket( vos::OStreamSocket* pSocket );
 
 	SvStream *pReceiveStream;
 	BOOL DoReceiveDataStream();				/// Recieve DataPacket from Socket
 class SimpleCommunicationLinkViaSocketWithReceiveCallbacks : public SimpleCommunicationLinkViaSocket
 {
 public:
-	SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket );
+	SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, vos::OStreamSocket *pSocket );
 	~SimpleCommunicationLinkViaSocketWithReceiveCallbacks();
 	virtual BOOL ReceiveDataStream();
 protected:
 public:
 	BOOL DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, ULONG nPort );
 protected:
-	virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, NAMESPACE_VOS(OConnectorSocket) *pCS )=0;
+	virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS )=0;
 };
 
 class SingleCommunicationManagerClientViaSocket : public SingleCommunicationManager, public ICommunicationManagerClient, CommonSocketFunctions
 	ByteString aHostToTalk;
 	ULONG nPortToTalk;
 protected:
-	virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, NAMESPACE_VOS(OConnectorSocket) *pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); }
+	virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); }
 };
 
 #endif

automation/source/communi/communi.cxx

 
 SV_IMPL_PTRARR_SORT( CommunicationLinkList, CommunicationLink* );
 
-NAMESPACE_VOS(OMutex) *pMPostUserEvent=NULL;		// Notwendig, da nicht threadfest
+vos::OMutex *pMPostUserEvent=NULL;		// Notwendig, da nicht threadfest
 
-CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket )
+CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket )
 : SimpleCommunicationLinkViaSocket( pMan, pSocket )
 , nConnectionClosedEventId( 0 )
 , nDataReceivedEventId( 0 )
 {
     SetPutDataReceivedHdl(LINK( this, CommunicationLinkViaSocket, PutDataReceivedHdl ));
     if ( !pMPostUserEvent )
-        pMPostUserEvent = new NAMESPACE_VOS(OMutex);
+        pMPostUserEvent = new vos::OMutex;
     // this is necassary to prevent the running thread from sending the close event
     // before the open event has been sent.
    	StartCallback();
 	while ( nConnectionClosedEventId || nDataReceivedEventId )
 		GetpApp()->Yield();
 	{
-		NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed );
+		vos::OGuard aGuard( aMConnectionClosed );
 		if ( nConnectionClosedEventId )
 		{
 			GetpApp()->RemoveUserEvent( nConnectionClosedEventId );
 		}
 	}
 	{
-		NAMESPACE_VOS(OGuard) aGuard( aMDataReceived );
+		vos::OGuard aGuard( aMDataReceived );
 		if ( nDataReceivedEventId )
 		{
 			GetpApp()->RemoveUserEvent( nDataReceivedEventId );
 
 		join();
 
-        NAMESPACE_VOS(OStreamSocket) *pTempSocket = GetStreamSocket();
+        vos::OStreamSocket *pTempSocket = GetStreamSocket();
         SetStreamSocket( NULL );
         delete pTempSocket;
 
 		SetNewPacketAsCurrent();
 		StartCallback();
 		{
-			NAMESPACE_VOS(OGuard) aGuard( aMDataReceived );
-            NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent );
+			vos::OGuard aGuard( aMDataReceived );
+            vos::OGuard aGuard2( *pMPostUserEvent );
             mlPutDataReceived.Call(this);
 		}
 	}
 
     StartCallback();
 	{
-		NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed );
-        NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent );
+		vos::OGuard aGuard( aMConnectionClosed );
+        vos::OGuard aGuard2( *pMPostUserEvent );
 		nConnectionClosedEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationLinkViaSocket, ConnectionClosed ) );
 	}
 }
 long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG )
 {
 	{
-		NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed );
+		vos::OGuard aGuard( aMConnectionClosed );
 		nConnectionClosedEventId = 0;	// Achtung!! alles andere mu� oben gemacht werden.
 	}
 	ShutdownCommunication();
 long CommunicationLinkViaSocket::DataReceived( void* EMPTYARG )
 {
 	{
-		NAMESPACE_VOS(OGuard) aGuard( aMDataReceived );
+		vos::OGuard aGuard( aMDataReceived );
 		nDataReceivedEventId = 0;	// Achtung!! alles andere mu� oben gemacht werden.
 	}
 	return CommunicationLink::DataReceived( );
 , xmNewConnection( NULL )
 {
     if ( !pMPostUserEvent )
-        pMPostUserEvent = new NAMESPACE_VOS(OMutex);
+        pMPostUserEvent = new vos::OMutex;
 	create();
 }
 
 	DEBUGPRINTF ("Destructor CommunicationManagerServerAcceptThread �bersprungen!!!! (wegen Solaris BUG)\n");
 #endif
 	{
-		NAMESPACE_VOS(OGuard) aGuard( aMAddConnection );
+		vos::OGuard aGuard( aMAddConnection );
 		if ( nAddConnectionEventId )
 		{
 			GetpApp()->RemoveUserEvent( nAddConnectionEventId );
 	if ( !nPortToListen )
 		return;
 
-	pAcceptorSocket = new NAMESPACE_VOS(OAcceptorSocket)();
-	NAMESPACE_VOS(OInetSocketAddr) Addr;
+	pAcceptorSocket = new vos::OAcceptorSocket();
+	vos::OInetSocketAddr Addr;
 	Addr.setPort( nPortToListen );
 	pAcceptorSocket->setReuseAddr( 1 );
 	if ( !pAcceptorSocket->bind( Addr ) )
 	}
 
 
-	NAMESPACE_VOS(OStreamSocket) *pStreamSocket = NULL;
+	vos::OStreamSocket *pStreamSocket = NULL;
 
 	while ( schedule() )
 	{
-		pStreamSocket = new NAMESPACE_VOS(OStreamSocket);
+		pStreamSocket = new vos::OStreamSocket;
 		switch ( pAcceptorSocket->acceptConnection( *pStreamSocket ) )
 		{
-		case NAMESPACE_VOS(ISocketTypes::TResult_Ok):
+		case vos::ISocketTypes::TResult_Ok:
 			{
 				pStreamSocket->setTcpNoDelay( 1 );
 
 				xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket );
 				xmNewConnection->StartCallback();
 				{
-					NAMESPACE_VOS(OGuard) aGuard( aMAddConnection );
-                    NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent );
+					vos::OGuard aGuard( aMAddConnection );
+                    vos::OGuard aGuard2( *pMPostUserEvent );
 					nAddConnectionEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationManagerServerAcceptThread, AddConnection ) );
 				}
 			}
 			break;
-		case NAMESPACE_VOS(ISocketTypes::TResult_TimedOut):
+		case vos::ISocketTypes::TResult_TimedOut:
 			delete pStreamSocket;
 			pStreamSocket = NULL;
 			break;
-		case NAMESPACE_VOS(ISocketTypes::TResult_Error):
+		case vos::ISocketTypes::TResult_Error:
 			delete pStreamSocket;
 			pStreamSocket = NULL;
 			break;
 
-		case NAMESPACE_VOS(ISocketTypes::TResult_Interrupted):
-		case NAMESPACE_VOS(ISocketTypes::TResult_InProgress):
+		case vos::ISocketTypes::TResult_Interrupted:
+		case vos::ISocketTypes::TResult_InProgress:
 			break;  // -Wall not handled...
 		}
 	}
 IMPL_LINK( CommunicationManagerServerAcceptThread, AddConnection, void*, EMPTYARG )
 {
 	{
-		NAMESPACE_VOS(OGuard) aGuard( aMAddConnection );
+		vos::OGuard aGuard( aMAddConnection );
 		nAddConnectionEventId = 0;
 	}
 	pMyServer->AddConnection( xmNewConnection );

automation/source/server/statemnt.cxx

 					                    nDirFlags = nFlags = Sb_ATTR_HIDDEN | Sb_ATTR_SYSTEM | Sb_ATTR_DIRECTORY;
 
 				                    // Nur diese Bitmaske ist unter Windows erlaubt
-	                    #ifdef WIN
-				                    if( nFlags & ~0x1E )
-                                    {
-                                        nDirFlags = 0;
-					                    StarBASIC::Error( SbERR_BAD_ARGUMENT );
-                                    }
-	                    #endif
 				                    // Sb_ATTR_VOLUME wird getrennt gehandelt
 				                    if( nDirFlags & Sb_ATTR_VOLUME )
 					                    aPath = aEntry.GetVolume();
 					                }
 					                DirEntry aNextEntry=(*(pDir))[nDirPos++];
 					                aPath = aNextEntry.GetName(); //Full();
-	                #ifdef WIN
-					                aNextEntry.ToAbs();
-					                String sFull(aNextEntry.GetFull());
-					                unsigned nFlags;