Browse Source

* VariantInit is a procedure, not a function (according to both MSDN and Delphi docs).

git-svn-id: trunk@16525 -
sergei 14 years ago
parent
commit
4e3cedb492
3 changed files with 5 additions and 5 deletions
  1. 1 1
      rtl/objpas/varutilh.inc
  2. 3 3
      rtl/objpas/varutils.inc
  3. 1 1
      rtl/win/varutils.pp

+ 1 - 1
rtl/objpas/varutilh.inc

@@ -28,7 +28,7 @@ function VariantChangeTypeEx(var VargDest: TVarData; const VargSrc: TVarData; LC
 function VariantClear(var Varg: TVarData): HRESULT; stdcall;
 function VariantClear(var Varg: TVarData): HRESULT; stdcall;
 function VariantCopy(var VargDest: TVarData; const VargSrc: TVarData): HRESULT; stdcall;
 function VariantCopy(var VargDest: TVarData; const VargSrc: TVarData): HRESULT; stdcall;
 function VariantCopyInd(var VargDest: TVarData;  const VargSrc: TVarData): HRESULT; stdcall;
 function VariantCopyInd(var VargDest: TVarData;  const VargSrc: TVarData): HRESULT; stdcall;
-function VariantInit(var Varg: TVarData): HRESULT; stdcall;
+procedure VariantInit(var Varg: TVarData); stdcall;
 
 
 {  Variant array functions }
 {  Variant array functions }
 
 

+ 3 - 3
rtl/objpas/varutils.inc

@@ -45,14 +45,13 @@ end;
     Basic variant handling.
     Basic variant handling.
   ---------------------------------------------------------------------}
   ---------------------------------------------------------------------}
 
 
-function VariantInit(var Varg: TVarData): HRESULT;stdcall;
+procedure VariantInit(var Varg: TVarData); stdcall;
 begin
 begin
   With Varg do
   With Varg do
     begin
     begin
       FillChar(VBytes, SizeOf(VBytes), 0);
       FillChar(VBytes, SizeOf(VBytes), 0);
       VType:=varEmpty;
       VType:=varEmpty;
     end;
     end;
-  Result:=VAR_OK;
 end;
 end;
 
 
 function VariantClear(var Varg: TVarData): HRESULT;stdcall;
 function VariantClear(var Varg: TVarData): HRESULT;stdcall;
@@ -84,7 +83,8 @@ begin
           exit(VAR_BADVARTYPE)
           exit(VAR_BADVARTYPE)
         end;
         end;
     end;
     end;
-  Result:=VariantInit(Varg);
+  VariantInit(Varg);
+  Result:=VAR_OK;
 end;
 end;
 
 
 function VariantCopy(var VargDest: TVarData; const VargSrc: TVarData): HRESULT;stdcall;
 function VariantCopy(var VargDest: TVarData; const VargSrc: TVarData): HRESULT;stdcall;

+ 1 - 1
rtl/win/varutils.pp

@@ -44,7 +44,7 @@ function VariantChangeTypeEx(var VargDest: TVarData; const VargSrc: TVarData; LC
 function VariantClear(var Varg: TVarData): HRESULT; stdcall;external oleaut;
 function VariantClear(var Varg: TVarData): HRESULT; stdcall;external oleaut;
 function VariantCopy(var VargDest: TVarData; const VargSrc: TVarData): HRESULT; stdcall;external oleaut;
 function VariantCopy(var VargDest: TVarData; const VargSrc: TVarData): HRESULT; stdcall;external oleaut;
 function VariantCopyInd(var VargDest: TVarData;  const VargSrc: TVarData): HRESULT; stdcall;external oleaut;
 function VariantCopyInd(var VargDest: TVarData;  const VargSrc: TVarData): HRESULT; stdcall;external oleaut;
-function VariantInit(var Varg: TVarData): HRESULT; stdcall;external oleaut;
+procedure VariantInit(var Varg: TVarData); stdcall;external oleaut;
 
 
 {  Variant array functions }
 {  Variant array functions }