* Fixed warnings.

git-svn-id: trunk@9513 -

rtl/objpas/strutils.pp

@@ -374,15 +374,14 @@ end;
 
 Function StuffString(const AText: string; AStart, ALength: Cardinal;  const ASubText: string): string;
 
-var i,j : SizeUInt;
-    k   : SizeInt;
+var i,j,k : SizeUInt;
 
 begin
   j:=length(ASubText);
   i:=length(AText);
   if AStart>i then 
     aStart:=i+1;
-  k:=i-AStart+1;
+  k:=i+1-AStart;
   if ALength> k then
     ALength:=k;
   SetLength(Result,i+j-ALength);

rtl/win/sysutils.pp

@@ -92,8 +92,8 @@ function CheckWin32Version(Major : Integer): Boolean;
 
 function CheckWin32Version(Major,Minor: Integer): Boolean;
   begin
-    Result:=(Win32MajorVersion>Major) or
-            ((Win32MajorVersion=Major) and (Win32MinorVersion>=Minor));
+    Result:=(Win32MajorVersion>dword(Major)) or
+            ((Win32MajorVersion=dword(Major)) and (Win32MinorVersion>=dword(Minor)));
   end;