Browse Source

* Fixed warnings.

git-svn-id: trunk@22619 -
yury 12 years ago
parent
commit
1a6605fd02
2 changed files with 6 additions and 7 deletions
  1. 4 5
      packages/winunits-base/src/comobj.pp
  2. 2 2
      packages/winunits-base/src/comserv.pp

+ 4 - 5
packages/winunits-base/src/comobj.pp

@@ -879,6 +879,7 @@ implementation
         WriteLn('LockServer: ', fLock);
         WriteLn('LockServer: ', fLock);
 {$endif}
 {$endif}
         RunError(217);
         RunError(217);
+        Result:=0;
       end;
       end;
 
 
 
 
@@ -888,6 +889,7 @@ implementation
         WriteLn('GetLicInfo');
         WriteLn('GetLicInfo');
 {$endif}
 {$endif}
         RunError(217);
         RunError(217);
+        Result:=0;
       end;
       end;
 
 
 
 
@@ -897,6 +899,7 @@ implementation
         WriteLn('RequestLicKey');
         WriteLn('RequestLicKey');
 {$endif}
 {$endif}
         RunError(217);
         RunError(217);
+        Result:=0;
       end;
       end;
 
 
 
 
@@ -908,6 +911,7 @@ implementation
         WriteLn('CreateInstanceLic');
         WriteLn('CreateInstanceLic');
 {$endif}
 {$endif}
         RunError(217);
         RunError(217);
+        Result:=0;
       end;
       end;
 
 
 
 
@@ -996,9 +1000,6 @@ HKCR
 
 
     procedure TComObjectFactory.UpdateRegistry(Register: Boolean);
     procedure TComObjectFactory.UpdateRegistry(Register: Boolean);
       var
       var
-        {$ifndef DUMMY_REG}
-        reg: TRegistry;
-        {$endif}
         classidguid: String;
         classidguid: String;
 
 
         function ThreadModelToString(model: TThreadingModel): String;
         function ThreadModelToString(model: TThreadingModel): String;
@@ -1687,8 +1688,6 @@ HKCR
     function TAutoObject.Invoke(DispID: LongInt; const iid: TGUID;
     function TAutoObject.Invoke(DispID: LongInt; const iid: TGUID;
       LocaleID: longint; Flags: Word; var params; VarResult, ExcepInfo,
       LocaleID: longint; Flags: Word; var params; VarResult, ExcepInfo,
       ArgErr: pointer): HResult; stdcall;
       ArgErr: pointer): HResult; stdcall;
-      var
-        fInterfacePointer: Pointer;
       begin
       begin
 {$ifdef DEBUG_COM}
 {$ifdef DEBUG_COM}
         WriteLn('TAutoIntfObject.Invoke: ', DispID, ': ', Flags, ': ', TDispParams(params).cArgs, ': ', GUIDToString(iid));
         WriteLn('TAutoIntfObject.Invoke: ', DispID, ': ', Flags, ': ', TDispParams(params).cArgs, ': ', GUIDToString(iid));

+ 2 - 2
packages/winunits-base/src/comserv.pp

@@ -113,7 +113,7 @@ begin
 {$endif}
 {$endif}
 end;
 end;
 
 
-{
+(*
     //FROM MSDN (Error messages are different in MSDN.DllGetClassObject)
     //FROM MSDN (Error messages are different in MSDN.DllGetClassObject)
 
 
     HRESULT hres = E_OUTOFMEMORY;
     HRESULT hres = E_OUTOFMEMORY;
@@ -125,7 +125,7 @@ end;
         pClassFactory->Release();
         pClassFactory->Release();
     }
     }
     return hRes;
     return hRes;
-}
+*)
 
 
 function DllGetClassObject(const rclsid: REFIID {should be REFCLSID}; const riid: REFIID; out ppv: Pointer): HResult; stdcall;
 function DllGetClassObject(const rclsid: REFIID {should be REFCLSID}; const riid: REFIID; out ppv: Pointer): HResult; stdcall;
 var
 var