Browse Source

* error handling for Variants improved

florian 21 years ago
parent
commit
058d480f40

+ 4 - 4
rtl/beos/Makefile.fpc

@@ -11,8 +11,8 @@ units=system posix objpas strings \
       beos \
       dos \
       sysutils classes typinfo math varutils \
-      cpu mmx getopts heaptrc lineinfo variants types
-rsts=math varutils typinfo
+      cpu mmx getopts heaptrc lineinfo variants types sysconst
+rsts=math varutils typinfo sysconst
 
 [require]
 nortl=y
@@ -116,7 +116,7 @@ objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT)
 #
 
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) beos$(PPUEXT)
+                    objpas$(PPUEXT) beos$(PPUEXT) sysconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
@@ -137,7 +137,7 @@ varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
         $(COMPILER) -I$(OBJPASDIR) $(UNIXINC)/varutils.pp
 
 types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
-	$(COMPILER) $(OBJPASDIR)/types.pp
+  $(COMPILER) $(OBJPASDIR)/types.pp
 
 #
 # Other system-independent RTL Units

+ 5 - 2
rtl/beos/sysutils.pp

@@ -31,6 +31,9 @@ uses
 
 implementation
 
+  uses
+    sysconst;
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 
@@ -265,8 +268,8 @@ Finalization
 end.
 {
   $Log$
-  Revision 1.6  2003-11-25 16:29:16  florian
-  no message
+  Revision 1.7  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
 
   Revision 1.5  2003/03/29 15:16:26  hajny
     * dummy DirectoryExists added

+ 8 - 9
rtl/darwin/Makefile.fpc

@@ -16,8 +16,8 @@ units=$(SYSTEMUNIT) objpas strings baseunix \
       sysutils typinfo math varutils \
       cpu mmx charset ucomplex getopts heaptrc lineinfo \
       errors sockets gpm ipc terminfo \
-      video mouse keyboard console serial variants types systhrds sysctl
-rsts=math varutils typinfo
+      video mouse keyboard console serial variants types systhrds sysctl sysconst
+rsts=math varutils typinfo sysconst
 
 [require]
 nortl=y
@@ -31,7 +31,7 @@ target=freebsd
 
 [compiler]
 includedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC)
-sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) 
+sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
 targetdir=.
 
 [lib]
@@ -131,10 +131,10 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
 #
 
 baseunix$(PPUEXT) : $(UNIXINC)/errno.inc $(BSDINC)/bunxtype.inc ptypes.inc $(BSDINC)/ctypes.inc \
-	signal.inc $(UNIXINC)/bunxh.inc $(BSDINC)/bunxmain.inc $(BSDINC)/ostypes.inc \
-	$(BSDINC)/bunxfunc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \
-	$(BSDINC)/ostypes.inc $(BSDINC)/ossysch.inc $(BSDINC)/bunxmacr.inc $(UNIXINC)/gensigset.inc \
-	$(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
+  signal.inc $(UNIXINC)/bunxh.inc $(BSDINC)/bunxmain.inc $(BSDINC)/ostypes.inc \
+  $(BSDINC)/bunxfunc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \
+  $(BSDINC)/ostypes.inc $(BSDINC)/ossysch.inc $(BSDINC)/bunxmacr.inc $(UNIXINC)/gensigset.inc \
+  $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
 
 
 unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
@@ -165,7 +165,7 @@ printer$(PPUEXT) : $(UNIXINC)/printer.pp $(INC)/textrec.inc unix$(PPUEXT) $(SYST
 #
 
 sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/*.inc) \
-                    objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT)
+                    objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT)
         $(COMPILER) -I$(OBJPASDIR) $(UNIXINC)/sysutils.pp
 
 typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT)
@@ -219,4 +219,3 @@ terminfo$(PPUEXT) : terminfo.pp unix$(PPUEXT)
 callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
 
 sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT)
-

+ 6 - 6
rtl/emx/Makefile.fpc

@@ -13,8 +13,8 @@ units=$(SYSTEMUNIT) objpas strings \
       dos crt objects printer \
       sysutils classes typinfo math varutils variants \
       charset ucomplex cpu mmx getopts heaptrc lineinfo dynlibs \
-      video mouse keyboard variants types
-rsts=math varutils typinfo variants classes dateutils
+      video mouse keyboard variants types sysconst
+rsts=math varutils typinfo variants classes dateutils sysconst
 
 [require]
 nortl=y
@@ -155,12 +155,12 @@ printer$(PPUEXT) : $(OS2INC)/printer.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEX
 #
 
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) dos$(PPUEXT) doscalls$(PPUEXT)
-	$(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
+                    objpas$(PPUEXT) dos$(PPUEXT) doscalls$(PPUEXT) sysconst$(PPUEXT)
+  $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
 
 classes$(PPUEXT) : ../os2/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
                    sysutils$(PPUEXT) typinfo$(PPUEXT)
-	$(COMPILER) -Fi$(OBJPASDIR)/classes ../os2/classes.pp
+  $(COMPILER) -Fi$(OBJPASDIR)/classes ../os2/classes.pp
 
 typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT)
         $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp $(REDIR)
@@ -196,4 +196,4 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
 
 #
 # Other system-dependent RTL Units
-#
+#

+ 8 - 2
rtl/emx/sysutils.pp

@@ -31,6 +31,9 @@ uses
 
 implementation
 
+  uses
+    sysconst;
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 
@@ -881,7 +884,10 @@ end.
 
 {
   $Log$
-  Revision 1.12  2003-10-19 09:35:28  hajny
+  Revision 1.13  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.12  2003/10/19 09:35:28  hajny
     * fixes from OS/2 merged to EMX
 
   Revision 1.11  2003/10/14 21:15:20  hajny
@@ -918,4 +924,4 @@ end.
   Revision 1.1  2002/11/17 16:22:54  hajny
     + RTL for emx target
 
-}
+}

+ 10 - 11
rtl/freebsd/Makefile.fpc

@@ -16,8 +16,8 @@ units=$(SYSTEMUNIT) objpas strings syscall baseunix unixutil \
       sysutils typinfo systhrds classes math varutils \
       cpu mmx charset ucomplex crt getopts heaptrc lineinfo \
       errors sockets gpm ipc terminfo \
-      video mouse keyboard console serial variants types sysctl dateutils
-rsts=math varutils typinfo classes variants dateutils
+      video mouse keyboard console serial variants types sysctl dateutils sysconst
+rsts=math varutils typinfo classes variants dateutils sysconst
 
 [require]
 nortl=y
@@ -31,7 +31,7 @@ target=freebsd
 
 [compiler]
 includedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC)
-sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) 
+sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
 targetdir=.
 
 [lib]
@@ -68,7 +68,7 @@ endif
 # that generates release PPU files
 # which will not be recompiled
 ifdef RELEASE
-override FPCOPT+=-Ur 
+override FPCOPT+=-Ur
 endif
 
 # Paths
@@ -127,7 +127,7 @@ objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)
 
 
 dateutils$(PPUEXT): $(OBJPASDIR)/dateutils.pp baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
-	$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/dateutils.pp
+  $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/dateutils.pp
 
 
 strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
@@ -139,10 +139,10 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
 #
 
 baseunix$(PPUEXT) : errno.inc $(BSDINC)/bunxtype.inc ptypes.inc $(BSDINC)/ctypes.inc \
-	signal.inc $(UNIXINC)/bunxh.inc $(BSDINC)/bunxmain.inc $(BSDINC)/ostypes.inc \
-	$(BSDINC)/bunxfunc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \
-	$(BSDINC)/ostypes.inc $(BSDINC)/ossysch.inc $(BSDINC)/bunxmacr.inc $(UNIXINC)/gensigset.inc \
-	$(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
+  signal.inc $(UNIXINC)/bunxh.inc $(BSDINC)/bunxmain.inc $(BSDINC)/ostypes.inc \
+  $(BSDINC)/bunxfunc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \
+  $(BSDINC)/ostypes.inc $(BSDINC)/ossysch.inc $(BSDINC)/bunxmacr.inc $(UNIXINC)/gensigset.inc \
+  $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
 
 
 unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
@@ -173,7 +173,7 @@ printer$(PPUEXT) : $(UNIXINC)/printer.pp $(INC)/textrec.inc unix$(PPUEXT) $(SYST
 #
 
 sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT)
+                    objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
@@ -231,4 +231,3 @@ terminfo$(PPUEXT) : terminfo.pp unix$(PPUEXT)
 callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
 
 sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT)
-

+ 4 - 4
rtl/go32v2/Makefile.fpc

@@ -13,8 +13,8 @@ units=system objpas strings \
       sysutils classes math typinfo \
       cpu mmx ucomplex getopts heaptrc lineinfo \
       msmouse charset varutils \
-      video mouse keyboard variants vesamode types
-rsts=math varutils typinfo classes variants
+      video mouse keyboard variants vesamode types sysconst
+rsts=math varutils typinfo classes variants sysconst
 
 [require]
 nortl=y
@@ -149,7 +149,7 @@ graph$(PPUEXT) : graph.pp go32$(PPUEXT) ports$(PPUEXT) system$(PPUEXT) \
 #
 
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) dos$(PPUEXT) go32$(PPUEXT)
+                    objpas$(PPUEXT) dos$(PPUEXT) go32$(PPUEXT) sysconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
@@ -194,4 +194,4 @@ ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT)
 
 msmouse$(PPUEXT) : msmouse.pp system$(PPUEXT)
 
-callspec$(PPUEXT) : $(INC)/callspec.pp system$(PPUEXT)
+callspec$(PPUEXT) : $(INC)/callspec.pp system$(PPUEXT)

+ 7 - 1
rtl/go32v2/sysutils.pp

@@ -30,6 +30,9 @@ uses
 
 implementation
 
+  uses
+    sysconst;
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 
@@ -768,7 +771,10 @@ Finalization
 end.
 {
   $Log$
-  Revision 1.18  2003-11-05 11:42:27  florian
+  Revision 1.19  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.18  2003/11/05 11:42:27  florian
     * applied patch from Joe da Silva to fix OpenFile on older DOS versions
 
   Revision 1.17  2003/10/25 23:42:35  hajny

+ 8 - 9
rtl/linux/Makefile.fpc

@@ -14,8 +14,8 @@ units=$(SYSTEMUNIT) baseunix strings systhrds  objpas syscall unixutil \
       sysutils typinfo math varutils \
       charset ucomplex getopts \
       errors sockets gpm ipc serial terminfo dl dynlibs \
-      video mouse keyboard variants types dateutils
-rsts=math varutils typinfo variants classes
+      video mouse keyboard variants types dateutils sysconst
+rsts=math varutils typinfo variants classes sysconst
 
 [require]
 nortl=y
@@ -65,7 +65,7 @@ LINUXUNIT1=
 ifeq ($(CPU_TARGET),i386)
 CPU_UNITS+=oldlinux
 endif
-LINUXUNIT2=linux 
+LINUXUNIT2=linux
 PRT0=prt0
 else
 SYSTEMUNIT=syslinux
@@ -164,10 +164,10 @@ unix$(PPUEXT) : unix.pp strings$(PPUEXT) baseunix$(PPUEXT) $(INC)/textrec.inc $(
                  unixsysc.inc
 
 baseunix$(PPUEXT) : errno.inc bunxtype.inc ptypes.inc ctypes.inc \
-	signal.inc $(UNIXINC)/bunxh.inc bunxmain.inc ostypes.inc \
-	bunxfunc.inc $(CPU_TARGET)/syscallh.inc $(CPU_TARGET)/sysnr.inc \
-	ostypes.inc ossysch.inc bunxmacr.inc $(UNIXINC)/gensigset.inc \
-	$(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
+  signal.inc $(UNIXINC)/bunxh.inc bunxmain.inc ostypes.inc \
+  bunxfunc.inc $(CPU_TARGET)/syscallh.inc $(CPU_TARGET)/sysnr.inc \
+  ostypes.inc ossysch.inc bunxmacr.inc $(UNIXINC)/gensigset.inc \
+  $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
 
 ports$(PPUEXT) : ports.pp unix$(PPUEXT) objpas$(PPUEXT)
 
@@ -207,7 +207,7 @@ ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp unix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 #
 
 sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT)
+                    objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
@@ -264,4 +264,3 @@ terminfo$(PPUEXT) : terminfo.pp unix$(PPUEXT)
 
 callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
 
-

+ 15 - 15
rtl/macos/Makefile.fpc

@@ -7,7 +7,7 @@ main=rtl
 
 [target]
 loaders=
-units=system 
+units=system
 # exec strings \
 #      dos crt objects printer \
 #      objpas \
@@ -77,36 +77,36 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 #
 
 #prt0$(OEXT) : prt0$(LOADEREXT)
-#	-$(AS) prt0$(LOADEREXT) -o prt0$(OEXT)
+#  -$(AS) prt0$(LOADEREXT) -o prt0$(OEXT)
 
 #gprt0$(OEXT) : $(GLOADERAS)
-#	-$(AS) $(GLOADERAS) -o gprt0$(OEXT)
+#  -$(AS) $(GLOADERAS) -o gprt0$(OEXT)
 
 #
 # Base Units (System, strings, os-dependent-base-unit)
 #
 
 system$(PPUEXT) : system.pp $(SYSLINUXDEPS) $(SYSDEPS)
-	$(COMPILER) -Us -Sg system.pp $(REDIR)
+  $(COMPILER) -Us -Sg system.pp $(REDIR)
 
 strings$(PPUEXT) : ../template/strings.pp system$(PPUEXT)
-	$(COMPILER) ../template/strings.pp $(REDIR)
+  $(COMPILER) ../template/strings.pp $(REDIR)
 
 exec$(PPUEXT) : exec.pp exec.inc system$(PPUEXT)
-	$(COMPILER) exec $(REDIR)
+  $(COMPILER) exec $(REDIR)
 
 #
 # Delphi Object Model
 #
 
 objpas$(PPUEXT) : $(OBJPASDIR)/objpas.pp system$(PPUEXT)
-	$(COPY) $(OBJPASDIR)/objpas.pp .
-	$(COMPILER) objpas $(REDIR)
-	$(DEL) objpas.pp
+  $(COPY) $(OBJPASDIR)/objpas.pp .
+  $(COMPILER) objpas $(REDIR)
+  $(DEL) objpas.pp
 
-sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp objpas$(PPUEXT) system$(PPUEXT)
-	$(COPY) $(OBJPASDIR)/sysutils.pp .
-	$(COMPILER) sysutils $(REDIR)
+sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp objpas$(PPUEXT) system$(PPUEXT) sysconst$(PPUEXT)
+  $(COPY) $(OBJPASDIR)/sysutils.pp .
+  $(COMPILER) sysutils $(REDIR)
 #$(DEL) sysutils.pp
 
 #
@@ -125,7 +125,7 @@ crt$(PPUEXT) : crt.pp $(INC)/textrec.inc system$(PPUEXT)
 
 printer$(PPUEXT) : printer.pp system$(PPUEXT)
         $(COMPILER) printer $(REDIR)
-	
+
 objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT)
         $(COMPILER) $(INC)/objects.pp $(REDIR)
 
@@ -135,6 +135,6 @@ objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT)
 
 getopts$(PPUEXT) : $(INC)/getopts.pp strings$(PPUEXT) system$(PPUEXT)
         $(COMPILER) $(INC)/getopts.pp $(REDIR)
-	
+
 heaptrc$(PPUEXT) : $(INC)/heaptrc.pp system$(PPUEXT)
-        $(COMPILER) $(INC)/heaptrc.pp $(REDIR)
+        $(COMPILER) $(INC)/heaptrc.pp $(REDIR)

+ 8 - 9
rtl/netbsd/Makefile.fpc

@@ -16,9 +16,9 @@ units=$(SYSTEMUNIT) objpas strings baseunix \
       sysutils classes typinfo math varutils \
        charset ucomplex getopts heaptrc lineinfo \
       errors sockets gpm ipc terminfo \
-      video mouse keyboard  serial variants types systhrds sysctl
+      video mouse keyboard  serial variants types systhrds sysctl sysconst
 units_netbsd_i386=mmx cpu
-rsts=math varutils typinfo variants classes
+rsts=math varutils typinfo variants classes sysconst
 
 [require]
 nortl=y
@@ -32,7 +32,7 @@ target=netbsd
 
 [compiler]
 includedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC)
-sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) 
+sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
 targetdir=.
 
 [lib]
@@ -132,10 +132,10 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
 #
 
 baseunix$(PPUEXT) : errno.inc $(BSDINC)/bunxtype.inc ptypes.inc $(BSDINC)/ctypes.inc \
-	signal.inc $(UNIXINC)/bunxh.inc $(BSDINC)/bunxmain.inc $(BSDINC)/ostypes.inc \
-	$(BSDINC)/bunxfunc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \
-	$(BSDINC)/ostypes.inc $(BSDINC)/ossysch.inc $(BSDINC)/bunxmacr.inc $(UNIXINC)/gensigset.inc \
-	$(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
+  signal.inc $(UNIXINC)/bunxh.inc $(BSDINC)/bunxmain.inc $(BSDINC)/ostypes.inc \
+  $(BSDINC)/bunxfunc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \
+  $(BSDINC)/ostypes.inc $(BSDINC)/ossysch.inc $(BSDINC)/bunxmacr.inc $(UNIXINC)/gensigset.inc \
+  $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
 
 
 unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
@@ -166,7 +166,7 @@ printer$(PPUEXT) : $(UNIXINC)/printer.pp $(INC)/textrec.inc unix$(PPUEXT) $(SYST
 #
 
 sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT)
+                    objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
@@ -224,4 +224,3 @@ terminfo$(PPUEXT) : terminfo.pp unix$(PPUEXT)
 callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
 
 sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT)
-

+ 5 - 5
rtl/netware/Makefile.fpc

@@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) systhrds objpas strings \
       cpu mmx getopts heaptrc lineinfo \
       sockets aio varutils \
       video mouse keyboard types \
-      nwsnut nwserv nwnit nwprot
+      nwsnut nwserv nwnit nwprot sysconst
 rsts=math typinfo varutils classes
 
 [require]
@@ -142,7 +142,7 @@ objects$(PPUEXT) : $(INC)/objects.pp $(SYSTEMUNIT)$(PPUEXT)
 #
 
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) dos$(PPUEXT) nwsys.inc
+                    objpas$(PPUEXT) dos$(PPUEXT) nwsys.inc sysconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
@@ -154,7 +154,7 @@ typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT)
 
 math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT)
         $(COMPILER) $(OBJPASDIR)/math.pp
-        
+
 gettext$(PPUEXT): $(OBJPASDIR)/gettext.pp objpas$(PPUEXT) sysutils$(PPUEXT)
         $(COMPILER) $(OBJPASDIR)/gettext.pp
 
@@ -163,7 +163,7 @@ varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
         $(COMPILER) -I$(OBJPASDIR) $(UNIXINC)/varutils.pp
 
 types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
-	$(COMPILER) $(OBJPASDIR)/types.pp
+  $(COMPILER) $(OBJPASDIR)/types.pp
 
 #
 # Other system-independent RTL Units
@@ -209,4 +209,4 @@ nwimp/tli.imp nwimp/vollib.imp nwimp/ws2_32.imp nwimp/ws2nlm.imp
 
 #override UNITPPUFILES+=cpu.a crt.a dos.a getopts.a heaptrc.a keyboard.a \
 #lineinfo.a math.a mmx.a mouse.a netware.a objects.a objpas.a sockets.a \
-#strings.a system.a sysutils.a typinfo.a varutils.a video.a winsock2.a
+#strings.a system.a sysutils.a typinfo.a varutils.a video.a winsock2.a

+ 9 - 3
rtl/netware/sysutils.pp

@@ -39,7 +39,7 @@ TYPE
 {$i sysutilh.inc}
 
 
-  
+
 { additional NetWare file flags}
 CONST
   faSHARE              = $00000080;  { Sharable file                   }
@@ -68,6 +68,9 @@ CONST
 
 implementation
 
+  uses
+    sysconst;
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 
@@ -497,7 +500,10 @@ end.
 {
 
   $Log$
-  Revision 1.12  2003-10-25 23:42:35  hajny
+  Revision 1.13  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.12  2003/10/25 23:42:35  hajny
     * THandle in sysutils common using System.THandle
 
   Revision 1.11  2003/04/12 13:21:27  armin
@@ -523,4 +529,4 @@ end.
   Revision 1.5  2002/03/08 19:10:14  armin
   * added 64 bit fileseek (currently only 32 bit supported)
 
-}
+}

+ 116 - 2
rtl/objpas/sysconst.pp

@@ -16,13 +16,127 @@ unit sysconst;
 
   interface
 
+    resourcestring
+      { from old str*.inc files }
+      SAbortError = 'Operation aborted';
+      SAbstractError = 'Abstract method called';
+      SAccessDenied = 'Access denied';
+      SAccessViolation = 'Access violation';
+      SArgumentMissing = 'Missing argument in format "%s"';
+      SAssertError = '%s (%s, line %d)';
+      SAssertionFailed = 'Assertion failed';
+      SControlC = 'Control-C hit';
+      SDiskFull = 'Disk Full';
+      SDispatchError = 'No variant method call dispatch';
+      SDivByZero = 'Division by zero';
+      SEndOfFile = 'Read past end of file';
+      SExceptionErrorMessage = 'exception at %p';
+      SExternalException = 'External exception %x';
+      SFileNotAssigned = 'File not assigned';
+      SFileNotFound = 'File not found';
+      SFileNotOpen = 'File not open';
+      SFileNotOpenForInput = 'File not open for input';
+      SFileNotOpenForOutput = 'File not open for output';
+      SInValidFileName = 'Invalid filename';
+      SIntfCastError = 'Interface not supported';
+      SIntOverflow = 'Arithmetic overflow';
+      SInvalidArgIndex = 'Invalid argument index in format "%s"';
+      SInvalidBoolean = '"%s" is not a valid boolean.';
+      SInvalidCast = 'Invalid type cast';
+      SInvalidDateTime = '%f is not a valid date/time value.';
+      SInvalidDrive = 'Invalid drive specified';
+      SInvalidFileHandle = 'Invalid file handle';
+      SInvalidFloat = '"%s" is an invalid float';
+      SInvalidFormat = 'Invalid format specifier : "%s"';
+      SInvalidGUID = '"%s" is not a valid GUID value';
+      SInvalidInput = 'Invalid input';
+      SInvalidInteger = '"%s" is an invalid integer';
+      SInvalidOp = 'Invalid floating point operation';
+      SInvalidPointer = 'Invalid pointer operation';
+      SInvalidVarCast = 'Invalid variant type case';
+      SInvalidVarOp = 'Invalid variant operation';
+      SOutOfMemory = 'Out of memory';
+      SOverflow = 'Floating point overflow';
+      SPrivilege = 'Privileged instruction';
+      SRangeError = 'Range check error';
+      SSafecallException = 'Exception in safecall method';
+      STooManyOpenFiles = 'Too many open files';
+      SUnKnownRunTimeError = 'Unknown Run-Time error : %3.3d';
+      SUnderflow = 'Floating point underflow';
+      SUnknownErrorCode = 'Unknown error code: %d';
+      SVarArrayBounds = 'Variant array bounds error';
+      SVarArrayCreate = 'Variant array cannot be created';
+      SVarNotArray = 'Variant doesn''t contain an array';
+
+      SInvalidVarNullOp = 'Invalid NULL variant operation';
+      SInvalidVarOpWithHResultWithPrefix = 'Invalid variant operation (%s%.8x)'+NewLine+'%s';
+      SVarTypeRangeCheck1 = 'Range check error for variant of type (%s)';
+      SVarTypeRangeCheck2 = 'Range check error while converting variant of type (%s) into type (%s)';
+      SVarTypeOutOfRangeWithPrefix = 'Custom variant type (%s%.4x) is out of range';
+      SVarTypeAlreadyUsedWithPrefix = 'Custom variant type (%s%.4x) already used by %s';
+      SVarTypeNotUsableWithPrefix = 'Custom variant type (%s%.4x) is not usable';
+      SVarTypeTooManyCustom = 'Too many custom variant types have been registered';
+      SVarTypeCouldNotConvert = 'Could not convert variant of type (%s) into type (%s)';
+      SVarTypeConvertOverflow = 'Overflow while converting variant of type (%s) into type (%s)';
+      SVarOverflow = 'Variant overflow';
+      SVarInvalid = 'Invalid argument';
+      SVarBadType = 'Invalid variant type';
+      SVarNotImplemented = 'Operation not supported';
+      SVarOutOfMemory = 'Variant operation ran out memory';
+      SVarUnexpected = 'Unexpected variant error';
+      
+      SShortMonthNameJan = 'Jan';
+      SShortMonthNameFeb = 'Feb';
+      SShortMonthNameMar = 'Mar';
+      SShortMonthNameApr = 'Apr';
+      SShortMonthNameMay = 'May';
+      SShortMonthNameJun = 'Jun';
+      SShortMonthNameJul = 'Jul';
+      SShortMonthNameAug = 'Aug';
+      SShortMonthNameSep = 'Sep';
+      SShortMonthNameOct = 'Oct';
+      SShortMonthNameNov = 'Nov';
+      SShortMonthNameDec = 'Dec';
+
+      SLongMonthNameJan = 'January';
+      SLongMonthNameFeb = 'February';
+      SLongMonthNameMar = 'March';
+      SLongMonthNameApr = 'April';
+      SLongMonthNameMay = 'May';
+      SLongMonthNameJun = 'June';
+      SLongMonthNameJul = 'July';
+      SLongMonthNameAug = 'August';
+      SLongMonthNameSep = 'September';
+      SLongMonthNameOct = 'October';
+      SLongMonthNameNov = 'November';
+      SLongMonthNameDec = 'December';
+
+      SShortDayNameMon = 'Mon';
+      SShortDayNameTue = 'Tue';
+      SShortDayNameWed = 'Wed';
+      SShortDayNameThu = 'Thu';
+      SShortDayNameFri = 'Fri';
+      SShortDayNameSat = 'Sat';
+      SShortDayNameSun = 'Sun';
+
+      SLongDayNameMon = 'Monday';
+      SLongDayNameTue = 'Tuesday';
+      SLongDayNameWed = 'Wednesday';
+      SLongDayNameThu = 'Thursday';
+      SLongDayNameFri = 'Friday';
+      SLongDayNameSat = 'Saturday';
+      SLongDayNameSun = 'Sunday';
+
   implementation
 
 end.
 {
   $Log$
-  Revision 1.1  2003-09-03 14:09:37  florian
+  Revision 1.2  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.1  2003/09/03 14:09:37  florian
     * arm fixes to the common rtl code
     * some generic math code fixed
     * ...
-}
+}

+ 6 - 4
rtl/objpas/sysutils/sysutilh.inc

@@ -13,7 +13,6 @@
 
  **********************************************************************}
 
-
   { Read date & Time function declarations }
   {$i osutilsh.inc}
 
@@ -142,7 +141,7 @@ type
    EAbort           = Class(Exception);
    EAbstractError   = Class(Exception);
    EAssertionFailed = Class(Exception);
-
+   
    EPropReadOnly = class(Exception);
    EPropWriteOnly = class(Exception);
 
@@ -219,7 +218,10 @@ Type
 
 {
   $Log$
-  Revision 1.2  2003-10-25 23:43:59  hajny
+  Revision 1.3  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.2  2003/10/25 23:43:59  hajny
     * THandle in sysutils common using System.THandle
 
   Revision 1.1  2003/10/06 21:01:06  peter
@@ -240,4 +242,4 @@ Type
   Revision 1.16  2002/01/25 17:42:03  peter
     * interface helpers
 
-}
+}

+ 9 - 19
rtl/objpas/sysutils/sysutils.inc

@@ -13,18 +13,6 @@
 
  **********************************************************************}
 
-  { Read message string definitions }
-  {
-   Add a language with IFDEF LANG_NAME
-   just befor the final ELSE. This way English will always be the default.
-  }
-
-  {$IFDEF LANG_GERMAN}
-  {$i strg.inc} // Does not exist yet !!
-  {$ELSE}
-  {$i stre.inc}
-  {$ENDIF}
-
   { Read filename handling functions implementation }
   {$i fina.inc}
 
@@ -173,7 +161,7 @@ Var
   Message : String;
   {$IFDEF VIRTUALPASCAL}
   stdout:text absolute output;
-  {$ENDIF}                           
+  {$ENDIF}
 begin
   Writeln(stdout,'An unhandled exception occurred at 0x',HexStr(Longint(Addr),8),' :');
   if Obj is exception then
@@ -311,7 +299,7 @@ begin
   {$IFDEF VIRTUALPASCAL}
   // vpascal does exceptions more the delphi way...
   // this needs to be written from scratch.
-  {$ELSE} 
+  {$ELSE}
   If RaiseList=Nil then
     Result:=Nil
   else
@@ -325,7 +313,7 @@ begin
   {$IFDEF VIRTUALPASCAL}
   // vpascal does exceptions more the delphi way...
   // this needs to be written from scratch.
-  {$ELSE}                         
+  {$ELSE}
   If RaiseList=Nil then
     Result:=Nil
   else
@@ -379,7 +367,7 @@ begin
 {$ifdef VER1_0}
   Raise EAbort.Create(SAbortError) at Longint(Get_Caller_addr(Get_Frame));
 {$else VER1_0}
-  Raise EAbort.Create(SAbortError) 
+  Raise EAbort.Create(SAbortError)
   {$IFNDEF VIRTUALPASCAL}
     at Pointer(Get_Caller_addr(Get_Frame));
   {$ENDIF}
@@ -394,7 +382,10 @@ end;
 
 {
   $Log$
-  Revision 1.1  2003-10-06 21:01:06  peter
+  Revision 1.2  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.1  2003/10/06 21:01:06  peter
     * moved classes unit to rtl
 
   Revision 1.17  2003/09/06 20:46:07  marco
@@ -427,5 +418,4 @@ end;
 
   Revision 1.8  2002/01/25 16:23:03  peter
     * merged filesearch() fix
-
-}
+}

+ 6 - 2
rtl/objpas/varutilh.inc

@@ -81,6 +81,7 @@ Procedure DumpVariant(Var F : Text; Const VArgSrc : TVarData);
 
 const
   VAR_OK            = HRESULT($00000000);
+  VAR_PARAMNOTFOUND = HRESULT($80020004);   
   VAR_TYPEMISMATCH  = HRESULT($80020005);
   VAR_BADVARTYPE    = HRESULT($80020008);
   VAR_EXCEPTION     = HRESULT($80020009);
@@ -103,7 +104,10 @@ const
 
 {
   $Log$
-  Revision 1.6  2002-09-07 16:01:23  peter
+  Revision 1.7  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.6  2002/09/07 16:01:23  peter
     * old logs removed and tabs fixed
 
-}
+}

+ 4 - 5
rtl/os2/Makefile.fpc

@@ -13,8 +13,8 @@ units=$(SYSTEMUNIT) objpas strings \
       dos crt objects printer \
       sysutils classes math typinfo varutils winsock \
       charset ucomplex cpu mmx getopts heaptrc lineinfo dynlibs \
-      video mouse keyboard variants types
-rsts=math varutils typinfo variants pmhelp classes
+      video mouse keyboard variants types sysconst
+rsts=math varutils typinfo variants pmhelp classes sysconst
 
 [require]
 nortl=y
@@ -166,7 +166,7 @@ printer$(PPUEXT) : printer.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
 #
 
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) dos$(PPUEXT) doscalls$(PPUEXT)
+                    objpas$(PPUEXT) dos$(PPUEXT) doscalls$(PPUEXT) sysconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
@@ -207,5 +207,4 @@ charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)
 
 #
 # Other system-dependent RTL Units
-#
-
+#

+ 8 - 2
rtl/os2/sysutils.pp

@@ -31,6 +31,9 @@ uses
 
 implementation
 
+  uses
+    sysconst;
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 
@@ -736,7 +739,10 @@ end.
 
 {
   $Log$
-  Revision 1.38  2003-11-23 15:50:07  yuri
+  Revision 1.39  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.38  2003/11/23 15:50:07  yuri
   * Now native
 
   Revision 1.37  2003/11/05 09:14:00  yuri
@@ -809,4 +815,4 @@ end.
   Revision 1.15  2002/01/25 16:23:03  peter
     * merged filesearch() fix
 
-}
+}

+ 7 - 5
rtl/posix/sysutils.pp

@@ -29,12 +29,11 @@ interface
 
 Procedure AddDisk(const path:string);
 
-
-
 implementation
 
-uses dos,posix;
-
+  uses
+    sysconst,dos,posix;
+ 
 { Include platform independent implementation part }
 {$i sysutils.inc}
 
@@ -546,7 +545,10 @@ Finalization
 end.
 {
     $Log$
-    Revision 1.8  2003-10-25 23:43:59  hajny
+    Revision 1.9  2003-11-26 20:00:19  florian
+      * error handling for Variants improved
+
+    Revision 1.8  2003/10/25 23:43:59  hajny
       * THandle in sysutils common using System.THandle
 
     Revision 1.7  2003/10/09 20:13:19  florian

+ 3 - 3
rtl/watcom/Makefile.fpc

@@ -17,7 +17,7 @@ units=system objpas strings watcom dos crt objects \
 # printer graph classes \
 # msmouse video mouse keyboard vesamode
 
-rsts=math varutils typinfo classes variants
+rsts=math varutils typinfo classes variants sysconst
 
 [require]
 nortl=y
@@ -152,7 +152,7 @@ graph$(PPUEXT) : graph.pp watcom$(PPUEXT) ports$(PPUEXT) system$(PPUEXT) \
 #
 
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) dos$(PPUEXT) watcom$(PPUEXT)
+                    objpas$(PPUEXT) dos$(PPUEXT) watcom$(PPUEXT) sysconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
@@ -197,4 +197,4 @@ ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT)
 
 msmouse$(PPUEXT) : msmouse.pp system$(PPUEXT)
 
-callspec$(PPUEXT) : $(INC)/callspec.pp system$(PPUEXT)
+callspec$(PPUEXT) : $(INC)/callspec.pp system$(PPUEXT)

+ 8 - 2
rtl/watcom/sysutils.pp

@@ -30,6 +30,9 @@ uses
 
 implementation
 
+  uses
+    sysconst;
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 
@@ -752,8 +755,11 @@ end.
 
 {
   $Log$
-  Revision 1.1  2003-11-17 19:55:13  hajny
+  Revision 1.2  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.1  2003/11/17 19:55:13  hajny
     * Wiktor Sywula: LFN detection uncommented in system, new units added
 
 
-}
+}

+ 6 - 6
rtl/win32/Makefile.fpc

@@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) systhrds objpas strings \
       cpu mmx charset ucomplex getopts \
       wincrt winmouse winevent sockets printer dynlibs \
       video mouse keyboard types comobj dateutils rtlconst sysconst
-rsts=math varutils typinfo variants classes dateutils
+rsts=math varutils typinfo variants classes dateutils sysconst
 
 [require]
 nortl=y
@@ -173,7 +173,7 @@ graph$(PPUEXT) : graph.pp strings$(PPUEXT) windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEX
 #
 
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) dos$(PPUEXT) windows$(PPUEXT)
+                    objpas$(PPUEXT) dos$(PPUEXT) windows$(PPUEXT) sysconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
@@ -197,13 +197,13 @@ comobj$(PPUEXT) : comobj.pp activex$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PP
         $(COMPILER) -I$(OBJPASDIR) comobj.pp
 
 rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp
-	$(COMPILER) $(OBJPASDIR)/rtlconst.pp
+  $(COMPILER) $(OBJPASDIR)/rtlconst.pp
 
 sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp
-	$(COMPILER) $(OBJPASDIR)/sysconst.pp
+  $(COMPILER) $(OBJPASDIR)/sysconst.pp
 
 dateutils$(PPUEXT) : $(OBJPASDIR)/dateutils.pp
-	$(COMPILER) $(OBJPASDIR)/dateutils.pp
+  $(COMPILER) $(OBJPASDIR)/dateutils.pp
 
 #
 # Other system-independent RTL Units
@@ -228,4 +228,4 @@ ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 # Other system-dependent RTL Units
 #
 
-callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
+callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)

+ 11 - 5
rtl/win32/sysutils.pp

@@ -52,10 +52,13 @@ Var
   Win32MinorVersion,
   Win32BuildNumber   : dword;
   Win32CSDVersion    : ShortString;   // CSD record is 128 bytes only?
-  
+
 
 implementation
 
+  uses
+    sysconst;
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 
@@ -680,7 +683,7 @@ Procedure LoadVersionInfo;
 // and getfreespaceex
 Var
    versioninfo : TOSVERSIONINFO;
-   i 	       : Integer;
+   i          : Integer;
 
 begin
    kernel32dll:=0;
@@ -699,7 +702,7 @@ begin
     begin
        kernel32dll:=LoadLibrary('kernel32');
        if kernel32dll<>0 then
-	{$IFDEF VIRTUALPASCAL}
+  {$IFDEF VIRTUALPASCAL}
          @GetDiskFreeSpaceEx:=GetProcAddress(0,'GetDiskFreeSpaceExA');
         {$ELSE}
          GetDiskFreeSpaceEx:=TGetDiskFreeSpaceEx(GetProcAddress(kernel32dll,'GetDiskFreeSpaceExA'));
@@ -730,7 +733,10 @@ Finalization
 end.
 {
   $Log$
-  Revision 1.26  2003-11-06 22:25:10  marco
+  Revision 1.27  2003-11-26 20:00:19  florian
+    * error handling for Variants improved
+
+  Revision 1.26  2003/11/06 22:25:10  marco
    * added some more of win32* delphi pseudo constants
 
   Revision 1.25  2003/10/25 23:44:33  hajny
@@ -775,4 +781,4 @@ end.
   Revision 1.12  2002/01/25 16:23:04  peter
     * merged filesearch() fix
 
-}
+}