Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r42 - branches/0.6

genelib
Discussion topic

Back to topic list

svn commit: r42 - branches/0.6

Author lotec
Full name Jan Bogaerts
Date 2006-05-02 04:55:19 PDT
Message Author: LoTeC
Date: 2006-05-02 04:55:18-0700
New Revision: 42

Modified:
   branches/0.6/Extract.gen
   branches/0.6/Fs.gen
   branches/0.6/WKernel32.gen

Log:
-some small fixes
-added GetCurrentDir in fs

Modified: branches/0.6/Extract.gen
Url: http://genelib.tigri​s.org/source/browse/​genelib/branches/0.6​/Extract.gen?view=di​ff&rev=42&p1​=branches/0.6/Extrac​t.gen&p2=branche​s/0.6/Extract.gen​&r1=41&r2=42
====================​====================​====================​==================
--- branches/0.6/Extract.gen (original)
+++ branches/0.6/Extract.gen 2006-05-02 04:55:18-0700
@@ -56,6 +56,8 @@
    //was no dilimiter
    [<-iPos > -1->
       iRes = aVal.SubString(iPos, int(aVal.NrRecords) - iPos)
+ <-->
+ iRes = aVal
    ]
    return(iRes)
 ;

Modified: branches/0.6/Fs.gen
Url: http://genelib.tigri​s.org/source/browse/​genelib/branches/0.6​/Fs.gen?view=diff​&rev=42&p1=bran​ches/0.6/Fs.gen&​p2=branches/0.6/Fs.g​en&r1=41&r2=​42
====================​====================​====================​==================
--- branches/0.6/Fs.gen (original)
+++ branches/0.6/Fs.gen 2006-05-02 04:55:18-0700
@@ -58,8 +58,74 @@
      UpDir(aDir: string&): string static //does the dos command 'cd ..' on the string (ex: c:\temp becomes c:\)
      RenameFile(aFile: string, aNew: string): bool static //renames a given file
      MonitorChanges(aChangelist: sMonitorChangeList&, aStop: THandle) yield int static //yield exp used to monitor changes in dirs and files (as defined in the list)
+ CurrentDir: string static
 ;
 
+exp sFsFindResult.GetName: string&
+=
+ iRes: string^
+ iRes.Create
+ iRes^ = char^(Data.cFileName)
+ return(iRes)
+;
+
+exp sFsFindResult.getLastWriteTime: FILETIME
+=
+ return(Data.ftLastWriteTime)
+;
+
+exp sFsFindResult.GetArchived: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_ARCHIVE))
+;
+
+exp sFsFindResult.GetCompressed: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_COMPRESSED))
+;
+
+exp sFsFindResult.getDirectory: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+;
+
+exp sFsFindResult.GetEncrypted: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_ENCRYPTED))
+;
+
+exp sFsFindResult.GetHidden: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_HIDDEN))
+;
+
+exp sFsFindResult.GetNormal: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_NORMAL))
+;
+
+exp sFsFindResult.GetReadOnly: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_READONLY))
+;
+
+exp sFsFindResult.GetSystem: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_SYSTEM))
+;
+
+exp sFsFindResult.GetOffLine: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_OFFLINE))
+;
+
+exp sFsFindResult.GetTemp: bool
+=
+ return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_TEMPORARY))
+;
+
+
+
 exp Fs.FileExists(aFile: string&): bool
 =
    iData: WIN32_FIND_DATA
@@ -201,66 +267,12 @@
      Filter: dword
 ;
 
-exp sFsFindResult.GetName: string&
+exp Fs.CurrentDir: string
 =
- iRes: string^
- iRes.Create
- iRes^ = char^(Data.cFileName)
+ iRes: string
+ iTemp: TCHAR@MAX_PATH
+ memory.memSet(iTemp, MAX_PATH, 0)
+ Kernel32.GetCurrentD​irectory(MAX_PATH, iTemp)
+ iRes = iTemp
    return(iRes)
 ;
-
-exp sFsFindResult.getLastWriteTime: FILETIME
-=
- return(Data.ftLastWriteTime)
-;
-
-exp sFsFindResult.GetArchived: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_ARCHIVE))
-;
-
-exp sFsFindResult.GetCompressed: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_COMPRESSED))
-;
-
-exp sFsFindResult.getDirectory: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-;
-
-exp sFsFindResult.GetEncrypted: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_ENCRYPTED))
-;
-
-exp sFsFindResult.GetHidden: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_HIDDEN))
-;
-
-exp sFsFindResult.GetNormal: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_NORMAL))
-;
-
-exp sFsFindResult.GetReadOnly: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_READONLY))
-;
-
-exp sFsFindResult.GetSystem: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_SYSTEM))
-;
-
-exp sFsFindResult.GetOffLine: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_OFFLINE))
-;
-
-exp sFsFindResult.GetTemp: bool
-=
- return(bool(data.dwF​ileAttributes & FILE_ATTRIBUTE_TEMPORARY))
-;
-

Modified: branches/0.6/WKernel32.gen
Url: http://genelib.tigri​s.org/source/browse/​genelib/branches/0.6​/WKernel32.gen?view=​diff&rev=42&​p1=branches/0.6/WKer​nel32.gen&p2=bra​nches/0.6/WKernel32.​gen&r1=41&r2​=42
====================​====================​====================​==================
--- branches/0.6/WKernel32.gen (original)
+++ branches/0.6/WKernel32.gen 2006-05-02 04:55:18-0700
@@ -237,8 +237,10 @@
 //Directories
      #[#<-UniCode == false->
           FindFirstChangeNotif​ication(aPath: char^, aWatchSubTree: bool, aNotifyFilter: dword): THandle stdcall extern 'FindFirstChangeNotificationA'
- #<-->
- FindFirstChangeNotif​ication(aPath: word^, aWatchSubTree: bool, aNotifyFilter: dword): THandle stdcall extern 'FindFirstChangeNotificationW'
+ GetCurrentDirectory(​aBufferLength: dword, aBuffer: char^): dword stdcall extern 'GetCurrentDirectoryA'
+ #<-->
+ FindFirstChangeNotif​ication(aPath: short^, aWatchSubTree: bool, aNotifyFilter: dword): THandle stdcall extern 'FindFirstChangeNotificationW'
+ GetCurrentDirectory(​aBufferLength: dword, aBuffer: short^): dword stdcall extern 'GetCurrentDirectoryW'
      #]
       FindNextChangeNotifi​cation(aHandle: THandle): bool stdcall extern 'FindNextChangeNotification'
       FindCloseChangeNotif​ication(aHandle: THandle): bool stdcall extern 'FindCloseChangeNotification'

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r42 - branches/0.6 lotec Jan Bogaerts 2006-05-02 04:55:19 PDT
Messages per page: