* fixed range check errors when compiling with -Cr

git-svn-id: trunk@6813 -

packages/base/mysql/mysql.inc

@@ -298,7 +298,7 @@ uses
        PNET = ^NET;
 
     const
-       packet_error : culong = not(0);
+       packet_error : culong = culong(not(0));
 
     type
        enum_field_types = (MYSQL_TYPE_DECIMAL,MYSQL_TYPE_TINY,
@@ -521,7 +521,7 @@ uses
 {$endif}
 
     const
-       NULL_LENGTH : dword = not(0); // For net_store_length
+       NULL_LENGTH : dword = dword(not(0)); // For net_store_length
 
     const
        MYSQL_STMT_HEADER = 4;

packages/fcl-registry/src/regdef.inc

@@ -1,12 +1,36 @@
+Type
+  LPDWORD = ^DWord;
+  LPVOID  = Pointer;
+  WINBOOL = LongBool;
+  LPCSTR  = PChar;
+  LPSTR   = Pchar;
+  LONG    = LongInt;
+  LPBYTE  = ^Byte;
+
+  ACCESS_MASK = DWORD;
+       REGSAM = ACCESS_MASK;
+
+  SECURITY_ATTRIBUTES = record
+    nLength : DWORD;
+    lpSecurityDescriptor : LPVOID;
+    bInheritHandle : WINBOOL;
+  end;
+  LPSECURITY_ATTRIBUTES = ^SECURITY_ATTRIBUTES;
+
+
+  HKEY = THandle;
+  PHKEY = ^HKEY;
+
+
 
 Const
-  HKEY_CLASSES_ROOT     = $80000000;
-  HKEY_CURRENT_USER     = $80000001;
-  HKEY_LOCAL_MACHINE    = $80000002;
-  HKEY_USERS            = $80000003;
-  HKEY_PERFORMANCE_DATA = $80000004;
-  HKEY_CURRENT_CONFIG   = $80000005;
-  HKEY_DYN_DATA         = $80000006;
+  HKEY_CLASSES_ROOT     = HKEY($80000000);
+  HKEY_CURRENT_USER     = HKEY($80000001);
+  HKEY_LOCAL_MACHINE    = HKEY($80000002);
+  HKEY_USERS            = HKEY($80000003);
+  HKEY_PERFORMANCE_DATA = HKEY($80000004);
+  HKEY_CURRENT_CONFIG   = HKEY($80000005);
+  HKEY_DYN_DATA         = HKEY($80000006);
 
   KEY_ALL_ACCESS         = $F003F;
   KEY_CREATE_LINK        = 32;
@@ -39,26 +63,4 @@ Const
 
   ERROR_SUCCESS = 0;
 
-Type
-  LPDWORD = ^DWord;
-  LPVOID  = Pointer;
-  WINBOOL = LongBool;
-  LPCSTR  = PChar;
-  LPSTR   = Pchar;
-  LONG    = LongInt;
-  LPBYTE  = ^Byte;
-
-  ACCESS_MASK = DWORD;
-       REGSAM = ACCESS_MASK;
-
-  SECURITY_ATTRIBUTES = record
-    nLength : DWORD;
-    lpSecurityDescriptor : LPVOID;
-    bInheritHandle : WINBOOL;
-  end;
-  LPSECURITY_ATTRIBUTES = ^SECURITY_ATTRIBUTES;
-
-
-  HKEY = THandle;
-  PHKEY = ^HKEY;