From 124bf1d108f21c3787ad758a4d0e1b66aa196223 Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Sun, 11 Oct 2020 15:49:03 +0000
Subject: [PATCH] # revisions: 44389,45572

git-svn-id: branches/fixes_3_2@47094 -
---
 packages/rtl-objpas/src/inc/variants.pp | 4 ++--
 rtl/objpas/sysutils/disk.inc            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/rtl-objpas/src/inc/variants.pp b/packages/rtl-objpas/src/inc/variants.pp
index 5a8e106875..4682f3bfae 100644
--- a/packages/rtl-objpas/src/inc/variants.pp
+++ b/packages/rtl-objpas/src/inc/variants.pp
@@ -54,12 +54,12 @@ type
 
 Const
   OrdinalVarTypes = [varSmallInt, varInteger, varBoolean, varShortInt,
-                     varByte, varWord,varLongWord,varInt64];
+                     varByte, varWord,varLongWord,varInt64,varQWord];
   FloatVarTypes = [
 {$ifndef FPUNONE}
     varSingle, varDouble,
 {$endif}
-    varCurrency];
+    varCurrency, varDecimal];
 
 { Variant support procedures and functions }
 
diff --git a/rtl/objpas/sysutils/disk.inc b/rtl/objpas/sysutils/disk.inc
index 7f80d64f1d..277156ace7 100644
--- a/rtl/objpas/sysutils/disk.inc
+++ b/rtl/objpas/sysutils/disk.inc
@@ -19,7 +19,7 @@ begin
   if length(ADrive)=0 then
     Result:=0
   else
-    Result := (Ord(ADrive[1]))-64;
+    Result := Ord(UpCase(ADrive[1]))-64;
 end;
 
 {$push}