From f379a1dccf60d5af9159eb97c828be41bd0bbd24 Mon Sep 17 00:00:00 2001
From: Filip Navara <xnavara@volny.cz>
Date: Mon, 12 Apr 2004 22:02:37 +0000
Subject: [PATCH] Get rid of E_UNSPEC non-standard error value.

---
 dlls/ole32/defaulthandler.c | 2 +-
 dlls/ole32/filemoniker.c    | 4 +---
 dlls/shdocvw/oleobject.c    | 2 +-
 include/winerror.h          | 4 ----
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index 9ae207bc56..5286dad542 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -925,7 +925,7 @@ static HRESULT WINAPI DefaultHandler_GetMoniker(
 
   }
 
-  return E_UNSPEC;
+  return E_FAIL;
 }
 
 /************************************************************************
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 52d9a99697..986ce9bb98 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -708,10 +708,8 @@ HRESULT WINAPI FileMonikerImpl_BindToStorage(IMoniker* iface,
         }
         else
             if ( (IsEqualIID(&IID_IStream, riid)) || (IsEqualIID(&IID_ILockBytes, riid)) )
-
-                return E_UNSPEC;
+                return E_FAIL;
             else
-
                 return E_NOINTERFACE;
     }
     else {
diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c
index d7db11a995..ffd538e144 100644
--- a/dlls/shdocvw/oleobject.c
+++ b/dlls/shdocvw/oleobject.c
@@ -220,7 +220,7 @@ static HRESULT WINAPI WBOOBJ_GetMoniker(LPOLEOBJECT iface, DWORD dwAssign,
                                         DWORD dwWhichMoniker, LPMONIKER *ppmk)
 {
     FIXME("stub (%p, %ld, %ld, %p)\n", iface, dwAssign, dwWhichMoniker, ppmk);
-    return E_UNSPEC;
+    return E_FAIL;
 }
 
 /************************************************************************
diff --git a/include/winerror.h b/include/winerror.h
index 0de4d8901d..771672d18b 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -1546,10 +1546,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)