E_UNSPEC

Filip Navara xnavara at volny.cz
Fri Apr 9 15:02:10 CDT 2004


Get rid of E_UNSPEC non-standard error value.

- Filip
-------------- next part --------------
--- include/winerror.h	Fri Jan 30 21:48:10 2004
+++ include/winerror.h	Fri Apr  9 19:58:44 2004
@@ -1545,10 +1545,6 @@
 #define E_POINTER                                          _HRESULT_TYPEDEF_(0x80004003L)
 #define E_ABORT                                            _HRESULT_TYPEDEF_(0x80004004L)
 #define E_FAIL                                             _HRESULT_TYPEDEF_(0x80004005L)
-/* FIXME: E_UNSPEC is not a standard value but it is used by
- * FileMoniker, IOleLink and DoDragDrop as a return value.
- */
-#define E_UNSPEC                                           E_FAIL
 
 
 #define CO_E_INIT_TLS                                      _HRESULT_TYPEDEF_(0x80004006L)
--- dlls/shdocvw/oleobject.c	Fri May 31 21:25:52 2002
+++ dlls/shdocvw/oleobject.c	Fri Apr  9 19:55:44 2004
@@ -220,7 +220,7 @@
                                         DWORD dwWhichMoniker, LPMONIKER *ppmk)
 {
     FIXME("stub (%p, %ld, %ld, %p)\n", iface, dwAssign, dwWhichMoniker, ppmk);
-    return E_UNSPEC;
+    return E_FAIL;
 }
 
 /************************************************************************
--- dlls/ole32/defaulthandler.c	Thu Sep 11 01:06:26 2003
+++ dlls/ole32/defaulthandler.c	Fri Apr  9 19:54:58 2004
@@ -925,7 +925,7 @@
 
   }
 
-  return E_UNSPEC;
+  return E_FAIL;
 }
 
 /************************************************************************
--- dlls/ole32/filemoniker.c	Fri Jan 23 21:51:42 2004
+++ dlls/ole32/filemoniker.c	Fri Apr  9 19:55:22 2004
@@ -708,10 +708,8 @@
         }
         else
             if ( (IsEqualIID(&IID_IStream, riid)) || (IsEqualIID(&IID_ILockBytes, riid)) )
-
-                return E_UNSPEC;
+                return E_FAIL;
             else
-
                 return E_NOINTERFACE;
     }
     else {


More information about the wine-patches mailing list