diff --git a/rtl/win32/activex.pp b/rtl/win32/activex.pp
index 43a7f6fd5b..7c8489cc6c 100644
--- a/rtl/win32/activex.pp
+++ b/rtl/win32/activex.pp
@@ -1522,7 +1522,7 @@ TYPE
 
    IClassFactory = Interface(IUnknown)
       ['{00000001-0000-0000-C000-000000000046}']
-      Function CreateInstance(Const unkOuter:IUnknown;Const riid : TIID;Out vObject : Pointer):HResult; StdCall;
+      Function CreateInstance(Const unkOuter:IUnknown;Const riid : TIID;Out vObject):HResult; StdCall;
       Function LockServer(fLock : Bool):HResult;StdCall;
       End;
 
@@ -2684,7 +2684,10 @@ end.
 
 {
   $Log$
-  Revision 1.11  2003-10-05 20:30:09  florian
+  Revision 1.12  2004-05-07 13:26:31  marco
+   * COM related fixes from bug 3090
+
+  Revision 1.11  2003/10/05 20:30:09  florian
     + necessary declarations for dx8 headers added
 
   Revision 1.10  2003/10/05 19:10:31  florian
diff --git a/rtl/win32/wininc/errors.inc b/rtl/win32/wininc/errors.inc
index 6bccc72066..74078a90e7 100644
--- a/rtl/win32/wininc/errors.inc
+++ b/rtl/win32/wininc/errors.inc
@@ -746,7 +746,7 @@
      E_NOTIMPL = DWORD($80004001);
      E_OUTOFMEMORY = DWORD($8007000E);
      E_INVALIDARG = DWORD($80070057);
-     E_NOINTERFACE = DWORD($80004002);
+     E_NOINTERFACE = HRESULT($80004002);
      E_POINTER = DWORD($80004003);
      E_HANDLE = DWORD($80070006);
      E_ABORT = DWORD($80004004);
@@ -1166,7 +1166,10 @@
 
 {
   $Log$
-  Revision 1.4  2002-09-07 16:01:31  peter
+  Revision 1.5  2004-05-07 13:26:31  marco
+   * COM related fixes from bug 3090
+
+  Revision 1.4  2002/09/07 16:01:31  peter
     * old logs removed and tabs fixed
 
 }
diff --git a/rtl/win32/wininc/redef.inc b/rtl/win32/wininc/redef.inc
index eeb7997793..f451ff7f52 100644
--- a/rtl/win32/wininc/redef.inc
+++ b/rtl/win32/wininc/redef.inc
@@ -249,6 +249,11 @@ function CallMsgFilterW(var lpMsg: TMsg; nCode: Integer): BOOL; external 'user32
 function CallNamedPipe(lpNamedPipeName: PChar; lpInBuffer: Pointer; nInBufferSize: DWORD; lpOutBuffer: Pointer; nOutBufferSize: DWORD; var lpBytesRead: DWORD; nTimeOut: DWORD): BOOL;external 'kernel32' name 'CallNamedPipeA';
 function CallNamedPipeA(lpNamedPipeName: LPCSTR; lpInBuffer: Pointer; nInBufferSize: DWORD; lpOutBuffer: Pointer; nOutBufferSize: DWORD; var lpBytesRead: DWORD; nTimeOut: DWORD): BOOL; external 'kernel32' name 'CallNamedPipeA';
 function CallNamedPipeW(lpNamedPipeName: LPWSTR; lpInBuffer: Pointer; nInBufferSize: DWORD; lpOutBuffer: Pointer; nOutBufferSize: DWORD; var lpBytesRead: DWORD; nTimeOut: DWORD): BOOL; external 'kernel32' name 'CallNamedPipeW';
+{$ifdef ver1_0}
+  function CoRegisterClassObject(const _para1:TCLSID; _para2:IUnknown; _para3:DWORD; _para4:DWORD; var _para5:DWORD):HRESULT;external 'ole32.dll' name 'CoRegisterClassObject';
+{$else}
+  function CoRegisterClassObject(const _para1:TCLSID; _para2:IUnknown; _para3:DWORD; _para4:DWORD; out_para5:DWORD):HRESULT;external 'ole32.dll' name 'CoRegisterClassObject';
+{$endif}
 function ChangeDisplaySettings(var lpDevMode: TDeviceMode; dwFlags: DWORD): Longint;external 'user32' name 'ChangeDisplaySettingsA';
 function ChangeDisplaySettingsA(var lpDevMode: TDeviceModeA; dwFlags: DWORD): Longint; external 'user32' name 'ChangeDisplaySettingsA';
 {$ifdef support_smartlink}
@@ -1055,7 +1060,10 @@ end;
 
 {
   $Log$
-  Revision 1.21  2004-05-05 20:08:38  marco
+  Revision 1.22  2004-05-07 13:26:31  marco
+   * COM related fixes from bug 3090
+
+  Revision 1.21  2004/05/05 20:08:38  marco
    * getdiskfreespaceex pointer overloads added
 
   Revision 1.20  2004/03/05 12:17:50  marco